Changeset 36:8882368a65b7 in mediastreamer2

Timestamp:

Sep 25, 2008 2:51:54 PM (5 years ago)

Author:

aymeric <aymeric@…>

Branch:

default

Message:

Add new bandwidth for testing larger image

git-svn-id: ​svn+ssh://svn.savannah.nongnu.org/linphone/trunk@39 3f6dc0c8-ddfe-455d-9043-3cd528dc4637

Location:

linphone/mediastreamer2

Files:

• include/mediastreamer2/msvideo.h (modified) (2 diffs)
• src/theora.c (modified) (1 diff)
• src/videoenc.c (modified) (1 diff)

linphone/mediastreamer2/include/mediastreamer2/msvideo.h

@@ -43 +43 @@
 #define MS_VIDEO_SIZE_720P_H 720
 
-
 #define MS_VIDEO_SIZE_NS1_W 324
 #define MS_VIDEO_SIZE_NS1_H 248
 
-#define MS_VIDEO_SIZE_MAX_W MS_VIDEO_SIZE_720P_W
-#define MS_VIDEO_SIZE_MAX_H MS_VIDEO_SIZE_720P_H
+#define MS_VIDEO_SIZE_1024_W 1024
+#define MS_VIDEO_SIZE_1024_H 768
+
+#define MS_VIDEO_SIZE_MAX_W MS_VIDEO_SIZE_1024_W
+#define MS_VIDEO_SIZE_MAX_H MS_VIDEO_SIZE_1024_H
 
 typedef struct MSVideoSize{
@@ -69 +71 @@
 
 #define MS_VIDEO_SIZE_NS1 (MSVideoSize){MS_VIDEO_SIZE_NS1_W,MS_VIDEO_SIZE_NS1_H}
+
+#define MS_VIDEO_SIZE_1024 (MSVideoSize){MS_VIDEO_SIZE_1024_W, MS_VIDEO_SIZE_1024_H}
 
 typedef enum{

linphone/mediastreamer2/src/theora.c

@@ -125 +125 @@
         s->tinfo.keyframe_data_target_bitrate=codecbr;
         /*those default settings would need to be affined*/
-        if (br>=512000){
+        if (br>=1024000){
+                vsize.width = MS_VIDEO_SIZE_1024_W;
+                vsize.height = MS_VIDEO_SIZE_1024_H;
+                s->tinfo.quality=32;
+                fps=15;
+        }else if (br>=512000){
                 vsize.width = MS_VIDEO_SIZE_CIF_W;
                 vsize.height = MS_VIDEO_SIZE_CIF_H;

linphone/mediastreamer2/src/videoenc.c

@@ -510 +510 @@
         bool_t snow=s->codec==CODEC_ID_SNOW;
         s->maxbr=*(int*)arg;
-        if (s->maxbr>=512000){
+        if (s->maxbr>=1024000 && s->codec!=CODEC_ID_H263P){
+                s->vsize.width = MS_VIDEO_SIZE_1024_W;
+                s->vsize.height = MS_VIDEO_SIZE_1024_H;
+                s->fps=17;
+        }else if (s->maxbr>=512000){
                 s->vsize.width=MS_VIDEO_SIZE_CIF_W;
                 s->vsize.height=MS_VIDEO_SIZE_CIF_H;