Changeset 3622 for pjproject/branches/projects/2.0-dev/pjmedia/src/pjmedia-codec/ffmpeg_codecs.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/pjmedia-codec/ffmpeg_codecs.c (modified) (2 diffs)

pjproject/branches/projects/2.0-dev/pjmedia/src/pjmedia-codec/ffmpeg_codecs.c

@@ -879 +879 @@
     /* Create pool for codec instance */
     pool = pj_pool_create(ffmpeg_factory.pf, "ffmpeg codec", 512, 512, NULL);
-    codec = PJ_POOL_ZALLOC_T(pool, pjmedia_vid_codec);
+    codec = PJ_POOL_ALLOC_T(pool, pjmedia_vid_codec);
     if (!codec) {
         status = PJ_ENOMEM;
         goto on_error;
     }
+    pjmedia_vid_codec_init(codec);
     codec->op = &ffmpeg_op;
     codec->factory = factory;
@@ -1404 +1405 @@
                 return status;
 
-            /* Notify application via the bit_info field of pjmedia_frame */
-            output->bit_info = PJMEDIA_VID_CODEC_EVENT_FMT_CHANGED;
+            /* Broadcast event */
+            if (pjmedia_event_publisher_has_sub(&codec->epub)) {
+                pjmedia_event event;
+
+                pjmedia_event_init(&event, PJMEDIA_EVENT_FMT_CHANGED,
+                                   &input->timestamp, &codec->epub);
+                event.data.fmt_changed.dir = PJMEDIA_DIR_DECODING;
+                pj_memcpy(&event.data.fmt_changed.new_fmt, &ff->param.dec_fmt,
+                          sizeof(ff->param.dec_fmt));
+                pjmedia_event_publish(&codec->epub, &event);
+            }
         }