Changeset 3776 for pjproject/trunk/pjsip-apps/src/samples/vid_streamutil.c

Timestamp:

Sep 29, 2011 8:31:15 AM (13 years ago)

Author:

bennylp

Message:

Closed #1361: codec API change. Details:

• changed encode(), packetize(), unpacketize(), and decode() to encode_begin(), encode_more(), and decode()
• codec has new "packing" setting
• updated stream, aviplay, codec-test, and stream-util due to above
• minor doxygen documentation fixes here and there

File:

• pjproject/trunk/pjsip-apps/src/samples/vid_streamutil.c (modified) (3 diffs)

pjproject/trunk/pjsip-apps/src/samples/vid_streamutil.c

@@ -302 +302 @@
         write_frame.buf = play_file->dec_buf;
         write_frame.size = play_file->dec_buf_size;
-        status = decoder->op->decode(decoder, &read_frame, write_frame.size,
-                                     &write_frame);
+        status = pjmedia_vid_codec_decode(decoder, 1, &read_frame,
+                                          write_frame.size, &write_frame);
         if (status != PJ_SUCCESS)
             return;
@@ -616 +616 @@
         pjmedia_video_format_detail *file_vfd;
         pjmedia_clock_param clock_param;
+        char fmt_name[5];
 
         /* Create file player */
@@ -625 +626 @@
         file_vfd = pjmedia_format_get_video_format_detail(&play_port->info.fmt,
                                                           PJ_TRUE);
-        PJ_LOG(2, (THIS_FILE, "Reading video stream %dx%d %c%c%c%c @%.2ffps",
+        PJ_LOG(2, (THIS_FILE, "Reading video stream %dx%d %s @%.2ffps",
                    file_vfd->size.w, file_vfd->size.h,
-                   ((play_port->info.fmt.id & 0x000000FF) >> 0),
-                   ((play_port->info.fmt.id & 0x0000FF00) >> 8),
-                   ((play_port->info.fmt.id & 0x00FF0000) >> 16),
-                   ((play_port->info.fmt.id & 0xFF000000) >> 24),
+                   pjmedia_fourcc_name(play_port->info.fmt.id, fmt_name),
                    (1.0*file_vfd->fps.num/file_vfd->fps.denum)));