From: Jaroslav Kysela <perex@perex.cz>
Date: Wed, 13 Sep 2017 09:11:14 +0000 (+0200)
Subject: transcode: use names instead numbers for pixfmt/samplefmt/audiolayout
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ff03d202c44a87f301d2c378ec2dacefb843c038;p=thirdparty%2Ftvheadend.git

transcode: use names instead numbers for pixfmt/samplefmt/audiolayout
---

diff --git a/src/transcoding/transcode/audio.c b/src/transcoding/transcode/audio.c
index b1977a8de..86965e048 100644
--- a/src/transcoding/transcode/audio.c
+++ b/src/transcoding/transcode/audio.c
@@ -137,17 +137,19 @@ tvh_audio_context_open_filters(TVHContext *self, AVDictionary **opts)
 {
     char source_args[128];
     char filters[16];
+    char layout[32];
     int resample = (self->iavctx->sample_rate != self->oavctx->sample_rate);
 
     // source args
     memset(source_args, 0, sizeof(source_args));
+    av_get_channel_layout_string(layout, sizeof(layout), self->iavctx->channels, self->iavctx->channel_layout);
     if (str_snprintf(source_args, sizeof(source_args),
-            "time_base=%d/%d:sample_rate=%d:sample_fmt=%d:channel_layout=0x%"PRIx64,
+            "time_base=%d/%d:sample_rate=%d:sample_fmt=%s:channel_layout=%s",
             self->iavctx->time_base.num,
             self->iavctx->time_base.den,
             self->iavctx->sample_rate,
-            self->iavctx->sample_fmt,
-            self->iavctx->channel_layout)) {
+            av_get_sample_fmt_name(self->iavctx->sample_fmt),
+            layout)) {
         return -1;
     }
 
diff --git a/src/transcoding/transcode/stream.c b/src/transcoding/transcode/stream.c
index b837b3488..92039e6b2 100644
--- a/src/transcoding/transcode/stream.c
+++ b/src/transcoding/transcode/stream.c
@@ -40,7 +40,7 @@ tvh_stream_is_copy(TVHCodecProfile *profile, tvh_ssc_t *ssc,
         if (codecs == NULL)
             goto cont;
         for (str = codecs; ; str = NULL) {
-            token = strtok_r(str," ,|;" , &saveptr);
+            token = strtok_r(str, " ,|;" , &saveptr);
             if (token == NULL)
                 break;
             if (!strcasecmp(token, txtname))
diff --git a/src/transcoding/transcode/video.c b/src/transcoding/transcode/video.c
index 75a030689..c9bf0a690 100644
--- a/src/transcoding/transcode/video.c
+++ b/src/transcoding/transcode/video.c
@@ -179,10 +179,10 @@ tvh_video_context_open_filters(TVHContext *self, AVDictionary **opts)
     // source args
     memset(source_args, 0, sizeof(source_args));
     if (str_snprintf(source_args, sizeof(source_args),
-            "video_size=%dx%d:pix_fmt=%d:time_base=%d/%d:pixel_aspect=%d/%d",
+            "video_size=%dx%d:pix_fmt=%s:time_base=%d/%d:pixel_aspect=%d/%d",
             self->iavctx->width,
             self->iavctx->height,
-            self->iavctx->pix_fmt,
+            av_get_pix_fmt_name(self->iavctx->pix_fmt),
             self->iavctx->time_base.num,
             self->iavctx->time_base.den,
             self->iavctx->sample_aspect_ratio.num,