Commit: 8e1255d542133cf6b378190d947254ca9df3347d - handbrake-jp-git (git)

githubのコードからのfolk

Commit MetaInfo

• Revision: 8e1255d542133cf6b378190d947254ca9df3347d (tree)
• Time: 2010-10-03 04:11:09
• Author: jstebbins <jstebbins@b64f...>
• Commiter: jstebbins

Log Message

fix ffmpeg locking issue
ffmpeg complained "insufficient thread locking around avcodec_open/close()".
This was caused by encavcodec.c calling avcodec_open at the same time as
stream.c called av_find_stream_info. av_find_stream_info has a side effect
of calling avcodec_open, so we must lock around this call as well.

git-svn-id: svn://localhost/HandBrake/trunk@3563 b64f7644-9d1e-0410-96f1-a4d463321fa5

Change Summary

• modified: libhb/hb.c
• modified: libhb/hbffmpeg.h
• modified: libhb/stream.c

Incremental Difference

--- a/libhb/hb.c
+++ b/libhb/hb.c
@@ -82,6 +82,15 @@ int hb_avcodec_open(AVCodecContext *avctx, AVCodec *codec)
     return ret;
 }
 
+int hb_av_find_stream_info(AVFormatContext *ic)
+{
+    int ret;
+    hb_lock( hb_avcodec_lock );
+    ret = av_find_stream_info( ic );
+    hb_unlock( hb_avcodec_lock );
+    return ret;
+}
+
 int hb_avcodec_close(AVCodecContext *avctx)
 {
     int ret;

--- a/libhb/hbffmpeg.h
+++ b/libhb/hbffmpeg.h
@@ -9,4 +9,5 @@
 void hb_avcodec_init(void);
 int hb_avcodec_open( AVCodecContext *, struct AVCodec * );
 int hb_avcodec_close( AVCodecContext * );
+int hb_av_find_stream_info(AVFormatContext *ic);
 int hb_ff_layout_xlat(int64_t ff_layout, int channels);

--- a/libhb/stream.c
+++ b/libhb/stream.c
@@ -2909,7 +2909,7 @@ static int ffmpeg_open( hb_stream_t *stream, hb_title_t *title )
     {
         return 0;
     }
-    if ( av_find_stream_info( ic ) < 0 )
+    if ( hb_av_find_stream_info( ic ) < 0 )
         goto fail;
 
     stream->ffmpeg_ic = ic;