KMP_PACKET_MEDIA_INFO: dump media info (including extradata in hex format)

Author: igorshevach

transcoder/KMP/KMP.c

@@ -781,3 +781,67 @@ bool KMP_read_ack(KMP_session_t *context,uint64_t* frame_id)
     }
     return false;
 }
+
+static const char *hex = "0123456789ABCDEF";
+
+int KMP_log_mediainfo(KMP_session_t *context,
+    const char *category, int level,
+    transcode_mediaInfo_t* transcodeMediaInfo) {
+
+    AVCodecParameters* params = transcodeMediaInfo->codecParams;
+
+    if(!params){
+        return -1;
+    }
+
+    char *ex = NULL;
+    if(params->extradata_size > 0 ){
+        ex = av_malloc(2 * params->extradata_size + 1);
+        char *walk = ex;
+        for(int i = 0; i < params->extradata_size; i++) {
+           *walk++ = hex[params->extradata[i] >> 4];
+           *walk++ = hex[params->extradata[i] & 0x0f];
+        }
+        *walk = '\0';
+    }
+
+    if (params->codec_type == AVMEDIA_TYPE_AUDIO) {
+
+        LOGGER(category,level,"[%s] KMP_PACKET_MEDIA_INFO type=audio"
+            " codec_id=%s (0x%x) samplerate=%d bps=%d channels=%d channel_layout=%d"
+            " bitrate=%.3f kbps timescale=%d:%d"
+            " extra_data=%s",
+            context->sessionName,
+            avcodec_get_name(params->codec_id),
+            params->codec_tag,
+            params->sample_rate,
+            params->bits_per_coded_sample,
+            params->channels,
+            params->channel_layout,
+            params->bit_rate / 1000.0, transcodeMediaInfo->timeScale.num, transcodeMediaInfo->timeScale.den,
+            ex);
+    }
+    else if (params->codec_type == AVMEDIA_TYPE_VIDEO) {
+
+        LOGGER(category,level,"[%s] KMP_PACKET_MEDIA_INFO type=video"
+            " codec_id=%s (0x%x) width=%d height=%d frame_rate=%d:%d"
+            " bitrate=%.3f kbps timescale=%d:%d"
+            " cc=%s extra_data=%s",
+            context->sessionName,
+            avcodec_get_name(params->codec_id),
+            params->codec_tag,
+            params->width,
+            params->height,
+            transcodeMediaInfo->frameRate.num, transcodeMediaInfo->frameRate.den,
+            params->bit_rate / 1000.0, transcodeMediaInfo->timeScale.num, transcodeMediaInfo->timeScale.den,
+            transcodeMediaInfo->closed_captions ? "yes" : "no",
+            ex);
+    }
+
+    if(ex) {
+        av_free(ex);
+    }
+
+    return 0;
+}
+

transcoder/KMP/KMP.h

@@ -50,6 +50,8 @@ int KMP_send_ack( KMP_session_t *context,kmp_frame_position_t *cur_pos);
 
 int KMP_close( KMP_session_t *context);
 
+int KMP_log_mediainfo(KMP_session_t *context, const char *category,int level,     transcode_mediaInfo_t* mediaInfo);
+
 
 int KMP_listen( KMP_session_t *context);
 int KMP_accept( KMP_session_t *context, KMP_session_t *client);

transcoder/receiver_server.c

@@ -107,7 +107,8 @@ int clientLoop(receiver_server_t *server,receiver_server_session_t *session,tran
                 LOGGER(CATEGORY_RECEIVER,AV_LOG_FATAL,"[%s] Invalid mediainfo",session->stream_name);
                 break;
             }
-            LOGGER(CATEGORY_RECEIVER,AV_LOG_INFO,"[%s] received packet  KMP_PACKET_MEDIA_INFO",session->stream_name);
+
+            KMP_log_mediainfo(transcode_session, CATEGORY_RECEIVER, AV_LOG_INFO, newParams);
 
             if( (retVal = transcode_session_async_set_mediaInfo(transcode_session, newParams)) < 0)
             {

transcoder/transcode/transcode_session.c

@@ -123,7 +123,7 @@ int transcode_session_set_media_info(transcode_session_t *ctx,transcode_mediaInf
             if (currentCodecParams->extradata_size>0 &&
                 newCodecParams->extradata!=NULL &&
                 currentCodecParams->extradata!=NULL
-                // FIXME: uncomment memcp!!!
+                // FIXME: uncomment memcmp!!!
                 && ctx->processedStats.totalFrames > 0
                 /*&& 0!=memcmp(newCodecParams->extradata,currentCodecParams->extradata,currentCodecParams->extradata_size)*/)
                 changed=true;
@@ -137,6 +137,8 @@ int transcode_session_set_media_info(transcode_session_t *ctx,transcode_mediaInf
         } else {
 
             LOGGER0(CATEGORY_TRANSCODING_SESSION,AV_LOG_ERROR,"changing media info on the fly is currently not supported");
+            avcodec_parameters_free(&newMediaInfo->codecParams);
+            av_free(newMediaInfo);
             return -1;
         }
     }