Changeset 3622 for pjproject/branches/projects/2.0-dev/pjmedia/src/test/vid_codec_test.c

Timestamp:

Jul 12, 2011 9:08:56 AM (13 years ago)

Author:

bennylp

Message:

More on re #1284:

• Replaced bit_info mechanism to report format change in codec with event
• Updated vid_port, vid_codec_test, etc.
• Add event publisher to vid_codec
• Add event publisher to pjmedia_port
• Add event publisher to vid_stream

File:

• pjproject/branches/projects/2.0-dev/pjmedia/src/test/vid_codec_test.c (modified) (6 diffs)

pjproject/branches/projects/2.0-dev/pjmedia/src/test/vid_codec_test.c

@@ -29 +29 @@
 } codec_port_data_t;
 
+static pj_status_t codec_on_event(pjmedia_event_subscription *esub,
+                                  pjmedia_event *event)
+{
+    codec_port_data_t *port_data = (codec_port_data_t*)esub->user_data;
+
+    if (event->type == PJMEDIA_EVENT_FMT_CHANGED) {
+        pjmedia_vid_codec *codec = port_data->codec;
+        pjmedia_vid_codec_param codec_param;
+        pj_status_t status;
+
+        ++event->proc_cnt;
+
+        status = codec->op->get_param(codec, &codec_param);
+        if (status != PJ_SUCCESS)
+            return status;
+
+        status = pjmedia_vid_dev_stream_set_cap(
+                        pjmedia_vid_port_get_stream(port_data->rdr_port),
+                        PJMEDIA_VID_DEV_CAP_FORMAT,
+                        &codec_param.dec_fmt);
+        if (status != PJ_SUCCESS)
+            return status;
+    }
+
+    return PJ_SUCCESS;
+}
+
 static pj_status_t codec_put_frame(pjmedia_port *port,
                                    pjmedia_frame *frame)
@@ -48 +75 @@
 #if !BYPASS_PACKETIZER
         if (enc_frame.size) {
-            unsigned pos = 0, i = 0;
+            unsigned pos = 0;
             pj_bool_t packetized = PJ_FALSE;
             unsigned unpack_pos = 0;
@@ -59 +86 @@
                                               (pj_uint8_t*)enc_frame.buf,
                                               enc_frame.size, &pos,
-                                              &payload, &payload_len);
+                                              (const pj_uint8_t**)&payload,
+                                              &payload_len);
                 if (status == PJ_ENOTSUP)
                     break;
@@ -87 +115 @@
         status = codec->op->decode(codec, &enc_frame, frame->size, frame);
         if (status != PJ_SUCCESS) goto on_error;
-
-        /* Detect format change */
-        if (frame->bit_info & PJMEDIA_VID_CODEC_EVENT_FMT_CHANGED) {
-            pjmedia_vid_codec_param codec_param;
-
-            status = codec->op->get_param(codec, &codec_param);
-            if (status != PJ_SUCCESS) goto on_error;
-
-            status = pjmedia_vid_dev_stream_set_cap(
-                            pjmedia_vid_port_get_stream(port_data->rdr_port),
-                            PJMEDIA_VID_DEV_CAP_FORMAT,
-                            &codec_param.dec_fmt);
-            if (status != PJ_SUCCESS) goto on_error;
-        }
     }
 #endif
@@ -170 +184 @@
     pjmedia_vid_port_param vport_param;
     pjmedia_video_format_detail *vfd;
+    pjmedia_event_subscription esub;
     pj_status_t status;
     int rc = 0;
@@ -277 +292 @@
         codec_param.dec_fmt.det = codec_param.enc_fmt.det;
 
+        /* Subscribe to codec events */
+        pjmedia_event_subscription_init(&esub, &codec_on_event,
+                                        &codec_port_data);
+        pjmedia_event_subscribe(&codec->epub, &esub);
 #endif /* !BYPASS_CODEC */
     }
-
 
     pjmedia_vid_port_param_default(&vport_param);