Attachment 119648 Details for Bug 162261 – patch-plugins__decoder__ffmpeg__k3bffmpegwrapper.cpp

patch-plugins__decoder__ffmpeg__k3bffmpegwrapper.cpp

patch-plugins__decoder__ffmpeg__k3bffmpegwrapper.cpp (text/plain), 2.89 KB, created by oz on 2011-11-03 00:50:09 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: oz

Created: 2011-11-03 00:50:09 UTC

Size: 2.89 KB

patch

obsolete

>--- ./plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp.orig
>+++ ./plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp
>@@ -109,7 +109,13 @@ bool K3bFFMpegFile::open()
> #else
>     ::AVCodecContext* codecContext =  d->formatContext->streams[0]->codec;
> #endif
>-    if( codecContext->codec_type != CODEC_TYPE_AUDIO ) {
>+    if( codecContext->codec_type != 
>+#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(52, 64, 0)
>+        AVMEDIA_TYPE_AUDIO)
>+#else
>+        CODEC_TYPE_AUDIO)
>+#endif
>+    {
>         kDebug() << "(K3bFFMpegFile) not a simple audio stream: " << m_filename;
>         return false;
>     }
>@@ -225,8 +231,11 @@ QString K3bFFMpegFile::typeComment() const
> QString K3bFFMpegFile::title() const
> {
>     // FIXME: is this UTF8 or something??
>-    if( d->formatContext->title[0] != '\0' )
>-        return QString::fromLocal8Bit( d->formatContext->title );
>+    AVDictionaryEntry *ade = av_dict_get( d->formatContext->metadata, "TITLE", NULL, 0 );
>+    if( ade == NULL )
>+        return QString();
>+    if( ade->value != '\0' )
>+        return QString::fromLocal8Bit( ade->value );
>     else
>         return QString();
> }
>@@ -235,8 +244,11 @@ QString K3bFFMpegFile::title() const
> QString K3bFFMpegFile::author() const
> {
>     // FIXME: is this UTF8 or something??
>-    if( d->formatContext->author[0] != '\0' )
>-        return QString::fromLocal8Bit( d->formatContext->author );
>+    AVDictionaryEntry *ade = av_dict_get( d->formatContext->metadata, "ARTIST", NULL, 0 );
>+    if( ade == NULL )
>+        return QString();
>+    if( ade->value != '\0' )
>+        return QString::fromLocal8Bit( ade->value );
>     else
>         return QString();
> }
>@@ -245,8 +257,11 @@ QString K3bFFMpegFile::author() const
> QString K3bFFMpegFile::comment() const
> {
>     // FIXME: is this UTF8 or something??
>-    if( d->formatContext->comment[0] != '\0' )
>-        return QString::fromLocal8Bit( d->formatContext->comment );
>+    AVDictionaryEntry *ade = av_dict_get( d->formatContext->metadata, "COMMENT", NULL, 0 );
>+    if( ade == NULL )
>+        return QString();
>+    if( ade->value != '\0' )
>+        return QString::fromLocal8Bit( ade->value );
>     else
>         return QString();
> }
>@@ -309,8 +324,13 @@ int K3bFFMpegFile::fillOutputBuffer()
> #if LIBAVCODEC_VERSION_MAJOR < 52
>         int len = ::avcodec_decode_audio(
> #else
>+   #if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(52, 64, 0)
>+        int len = ::avcodec_decode_audio3(
>+   #else
>         int len = ::avcodec_decode_audio2(
>+   #endif
> #endif
>+
> #ifdef FFMPEG_BUILD_PRE_4629
>             &d->formatContext->streams[0]->codec,
> #else
>@@ -318,7 +338,11 @@ int K3bFFMpegFile::fillOutputBuffer()
> #endif
>             (short*)d->alignedOutputBuffer,
>             &d->outputBufferSize,
>+#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(52, 64, 0)
>+            &d->packet );
>+#else
>             d->packetData, d->packetSize );
>+#endif
> 
>         if( d->packetSize <= 0 || len < 0 )
>             ::av_free_packet( &d->packet );

Actions: View

Attachments on bug 162261: 119648