Fix a bunch more of the ffmpeg deprecated stuff in plugins

This should get rid of almost all our plugin warnings. Thanks to Mark Kendall for fixing it in the core of mythtv and giving great examples of how to fix it for the plugins.
MythTV · May 8, 2011 · b7b6b11 · b7b6b11
1 parent 50d00e9
commit b7b6b11
Show file tree

Hide file tree

Showing 4 changed files with 36 additions and 15 deletions.
diff --git a/mythplugins/mytharchive/mytharchive/thumbfinder.cpp b/mythplugins/mytharchive/mytharchive/thumbfinder.cpp
@@ -568,7 +568,7 @@ bool ThumbFinder::initAVCodec(const QString &inFile)
         return false;
     }
     av_estimate_timings(m_inputFC, 0);
-    dump_format(m_inputFC, 0, inFileBA.constData(), 0);
+    av_dump_format(m_inputFC, 0, inFileBA.constData(), 0);
 
     // find the first video stream
     m_videostream = -1;

diff --git a/mythplugins/mytharchive/mytharchivehelper/main.cpp b/mythplugins/mytharchive/mytharchivehelper/main.cpp
@@ -2182,7 +2182,7 @@ static int getFileInfo(QString inFile, QString outFile, int lenMethod)
     av_estimate_timings(inputFC, 0);
 
     // Dump stream information
-    dump_format(inputFC, 0, inFileBA.constData(), 0);
+    av_dump_format(inputFC, 0, inFileBA.constData(), 0);
 
     QDomDocument doc("FILEINFO");
 
@@ -2330,8 +2330,11 @@ static int getFileInfo(QString inFile, QString outFile, int lenMethod)
                     stream.setAttribute("codec", codec.trimmed());
 
                 stream.setAttribute("channels", st->codec->channels);
-                if (strlen(st->language) > 0)
-                    stream.setAttribute("language", st->language);
+
+                AVMetadataTag *metatag = 
+                    av_metadata_get(st->metadata, "language", NULL, 0);
+                if (metatag)
+                    stream.setAttribute("language", metatag->value);
                 else
                     stream.setAttribute("language", "N/A");
 
@@ -2365,8 +2368,11 @@ static int getFileInfo(QString inFile, QString outFile, int lenMethod)
                 stream.setAttribute("streamindex", i);
                 stream.setAttribute("ffmpegindex", ffmpegIndex++);
                 stream.setAttribute("codec", codec.trimmed());
-                if (strlen(st->language) > 0)
-                    stream.setAttribute("language", st->language);
+
+                AVMetadataTag *metatag = 
+                    av_metadata_get(st->metadata, "language", NULL, 0);
+                if (metatag)
+                    stream.setAttribute("language", metatag->value);
                 else
                     stream.setAttribute("language", "N/A");
 

diff --git a/mythplugins/mythmusic/mythmusic/avfdecoder.cpp b/mythplugins/mythmusic/mythmusic/avfdecoder.cpp
@@ -284,7 +284,7 @@ bool avfDecoder::initialize()
     if (m_sampleFmt == FORMAT_NONE)
     {
         int bps =
-            av_get_bits_per_sample_format(m_audioDec->sample_fmt);
+            av_get_bits_per_sample_fmt(m_audioDec->sample_fmt);
         if (m_audioDec->sample_fmt == SAMPLE_FMT_S32 &&
             m_audioDec->bits_per_raw_sample)
         {

diff --git a/mythplugins/mythmusic/mythmusic/metaioavfcomment.cpp b/mythplugins/mythmusic/mythmusic/metaioavfcomment.cpp
@@ -54,20 +54,35 @@ Metadata* MetaIOAVFComment::read(QString filename)
     if (av_find_stream_info(p_context) < 0)
         return NULL;
 
-
-    title += (char *)p_context->title;
-    if (title.isEmpty())
+    AVMetadataTag *tag = av_metadata_get(p_context->metadata, "title", NULL, 0);
+    if (!tag)
     {
         readFromFilename(filename, artist, album, title, genre, tracknum);
     }
     else
     {
-        artist += (char *)p_context->author;
+	title = (char *)tag->value;
+
+	tag = av_metadata_get(p_context->metadata, "author", NULL, 0);
+        if (tag)
+	    artist += (char *)tag->value;
+
         // compilation_artist???
-        album += (char *)p_context->album;
-        genre += (char *)p_context->genre;
-        year = p_context->year;
-        tracknum = p_context->track;
+	tag = av_metadata_get(p_context->metadata, "album", NULL, 0);
+        if (tag)
+            album += (char *)tag->value;
+
+	tag = av_metadata_get(p_context->metadata, "genre", NULL, 0);
+        if (tag)
+            genre += (char *)tag->value;
+
+	tag = av_metadata_get(p_context->metadata, "year", NULL, 0);
+        if (tag)
+            year = atoi(tag->value);
+
+	tag = av_metadata_get(p_context->metadata, "tracknum", NULL, 0);
+        if (tag)
+            tracknum = atoi(tag->value);
     }
 
     length = getTrackLength(p_context);