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

Timestamp:

Apr 6, 2011 2:56:03 PM (14 years ago)

Author:

nanang

Message:

Re #1219: Added H.264 SDP fmtp "sprop-parameter-sets" to ffmpeg.

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

@@ -352 +352 @@
     }
 
+    if (ff->param.dir & PJMEDIA_DIR_DECODING) {
+        AVCodecContext *ctx = ff->dec_ctx;
+
+        /* Apply the "sprop-parameter-sets" fmtp from remote SDP to
+         * extradata of ffmpeg codec context.
+         */
+        if (data->fmtp.sprop_param_sets_len) {
+            ctx->extradata_size = data->fmtp.sprop_param_sets_len;
+            ctx->extradata = data->fmtp.sprop_param_sets;
+        }
+    }
+
     return PJ_SUCCESS;
 }
@@ -359 +371 @@
     h264_data *data = (h264_data*)ff->data;
     PJ_UNUSED_ARG(data);
-
-    // Where to apply the "sprop-parameter-sets" fmtp from remote SDP?
-    // Through decoder decode() or decoder context extradata?
-    PJ_TODO(apply_h264_fmtp_sprop_parameter_sets_from_remote_sdp);
-
     return PJ_SUCCESS;
 }