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

Timestamp:

Jul 15, 2011 10:19:59 AM (13 years ago)

Author:

nanang

Message:

Fix #1295: Added thin wrapper for audio and video codec operations.

File:

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

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

@@ -336 +336 @@
         case PJMEDIA_EVENT_FMT_CHANGED:
             /* Update param from codec */
-            stream->codec->op->get_param(stream->codec, stream->info.codec_param);
+            pjmedia_vid_codec_get_param(stream->codec, stream->info.codec_param);
 
             /* Update decoding channel port info */
@@ -764 +764 @@
 
     /* Encode! */
-    status = (*stream->codec->op->encode)(stream->codec, frame, 
-                                          channel->buf_size - 
-                                          sizeof(pjmedia_rtp_hdr),
-                                          &frame_out);
+    status = pjmedia_vid_codec_encode(stream->codec, frame, 
+                                      channel->buf_size - 
+                                      sizeof(pjmedia_rtp_hdr),
+                                      &frame_out);
     if (status != PJ_SUCCESS) {
         LOGERR_((channel->port.info.name.ptr, 
@@ -785 +785 @@
 
         /* Generate RTP payload */
-        status = (*stream->codec->op->packetize)(
-                                           stream->codec,
-                                           (pj_uint8_t*)frame_out.buf,
-                                           frame_out.size,
-                                           &processed,
-                                           (const pj_uint8_t**)&payload,
-                                           &payload_len);
+        status = pjmedia_vid_codec_packetize(stream->codec,
+                                             (pj_uint8_t*)frame_out.buf,
+                                             frame_out.size,
+                                             &processed,
+                                             (const pj_uint8_t**)&payload,
+                                             &payload_len);
         if (status != PJ_SUCCESS) {
             LOGERR_((channel->port.info.name.ptr, 
@@ -933 +932 @@
                 }
 
-                status = (*stream->codec->op->unpacketize)(
+                status = pjmedia_vid_codec_unpacketize(
                                                 stream->codec,
                                                 p, psize,
@@ -966 +965 @@
     frame_in.timestamp.u64 = last_ts;
 
-    status = stream->codec->op->decode(stream->codec, &frame_in,
-                                       frame->size, frame);
+    status = pjmedia_vid_codec_decode(stream->codec, &frame_in,
+                                      frame->size, frame);
     if (status != PJ_SUCCESS) {
         LOGERR_((port->info.name.ptr, "codec decode() error", 
@@ -1240 +1239 @@
 
     /* Init and open the codec. */
-    status = stream->codec->op->init(stream->codec, pool);
+    status = pjmedia_vid_codec_init(stream->codec, pool);
     if (status != PJ_SUCCESS)
         return status;
-    status = stream->codec->op->open(stream->codec, info->codec_param);
+    status = pjmedia_vid_codec_open(stream->codec, info->codec_param);
     if (status != PJ_SUCCESS)
         return status;
@@ -1446 +1445 @@
     /* Free codec. */
     if (stream->codec) {
-        stream->codec->op->close(stream->codec);
+        pjmedia_vid_codec_close(stream->codec);
         pjmedia_vid_codec_mgr_dealloc_codec(stream->codec_mgr, stream->codec);
         stream->codec = NULL;