Changeset 3641 for pjproject/branches/projects/2.0-dev/pjmedia/src/pjmedia/vid_stream.c

Timestamp:

Jul 14, 2011 6:34:29 AM (13 years ago)

Author:

bennylp

Message:

More re #1325 (pjmedia signature): invented pjmedia PJMEDIA_FOURCC macro, and change signature and pjmedia_format_id to use this object. Added pjmedia_fourcc_name( ) too

File:

• pjproject/branches/projects/2.0-dev/pjmedia/src/pjmedia/vid_stream.c (modified) (3 diffs)

pjproject/branches/projects/2.0-dev/pjmedia/src/pjmedia/vid_stream.c

@@ -310 +310 @@
 {
     const pjmedia_port_info *pi = &chan->port.info;
+    char fourcc_name[5];
 
     PJ_LOG(5, (pi->name.ptr,
-               " %s format %s: %dx%d %c%c%c%c%s %d/%d(~%d)fps",
+               " %s format %s: %dx%d %s%s %d/%d(~%d)fps",
                (chan->dir==PJMEDIA_DIR_DECODING? "Decoding":"Encoding"),
                event_name,
                pi->fmt.det.vid.size.w, pi->fmt.det.vid.size.h,
-               ((pi->fmt.id & 0x000000FF) >> 0),
-               ((pi->fmt.id & 0x0000FF00) >> 8),
-               ((pi->fmt.id & 0x00FF0000) >> 16),
-               ((pi->fmt.id & 0xFF000000) >> 24),
+               pjmedia_fourcc_name(pi->fmt.id, fourcc_name),
                (chan->dir==PJMEDIA_DIR_ENCODING?"->":"<-"),
                pi->fmt.det.vid.fps.num, pi->fmt.det.vid.fps.denum,
@@ -1050 +1048 @@
     const char *type_name;
     pjmedia_format *fmt;
+    char fourcc_name[5];
     pjmedia_port_info *pi;
     
@@ -1122 +1121 @@
 
     PJ_LOG(5, (name.ptr,
-               "%s channel created %dx%d %c%c%c%c%s%.*s %d/%d(~%d)fps",
+               "%s channel created %dx%d %s%s%.*s %d/%d(~%d)fps",
                (dir==PJMEDIA_DIR_ENCODING?"Encoding":"Decoding"),
                pi->fmt.det.vid.size.w, pi->fmt.det.vid.size.h,
-               ((pi->fmt.id & 0x000000FF) >> 0),
-               ((pi->fmt.id & 0x0000FF00) >> 8),
-               ((pi->fmt.id & 0x00FF0000) >> 16),
-               ((pi->fmt.id & 0xFF000000) >> 24),
+               pjmedia_fourcc_name(pi->fmt.id, fourcc_name),
                (dir==PJMEDIA_DIR_ENCODING?"->":"<-"),
                info->codec_info.encoding_name.slen,