[FFmpeg-cvslog] Merge remote-tracking branch 'ffmpeg-mt/master'

Alexander Strange git at videolan.org
Tue May 31 03:16:41 CEST 2011


ffmpeg | branch: master | Alexander Strange <astrange at ithinksw.com> | Tue May 31 03:10:35 2011 +0200| [a54dceb26af072d049c3f3f003f2a4ab0df26987] | committer: Michael Niedermayer

    Merge remote-tracking branch 'ffmpeg-mt/master'

    * ffmpeg-mt/master:
      Update todo
      The maximum buffer size needs to be 33, not 32

    merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a54dceb26af072d049c3f3f003f2a4ab0df26987
---

 libavcodec/pthread.c |    2 +-
 libavcodec/utils.c   |    2 +-
 mt-work/todo.txt     |    5 +++--
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/libavcodec/pthread.c b/libavcodec/pthread.c
index 6d4ee54..4b68bce 100644
--- a/libavcodec/pthread.c
+++ b/libavcodec/pthread.c
@@ -55,7 +55,7 @@ typedef struct ThreadContext {
 } ThreadContext;
 
 /// Max number of frame buffers that can be allocated when using frame threads.
-#define MAX_BUFFERS 32
+#define MAX_BUFFERS 33
 
 /**
  * Context used by codec threads and stored in their AVCodecContext thread_opaque.
diff --git a/libavcodec/utils.c b/libavcodec/utils.c
index 95f41f3..1c61e68 100644
--- a/libavcodec/utils.c
+++ b/libavcodec/utils.c
@@ -115,7 +115,7 @@ typedef struct InternalBuffer{
     enum PixelFormat pix_fmt;
 }InternalBuffer;
 
-#define INTERNAL_BUFFER_SIZE 32
+#define INTERNAL_BUFFER_SIZE 33
 
 void avcodec_align_dimensions2(AVCodecContext *s, int *width, int *height, int linesize_align[4]){
     int w_align= 1;
diff --git a/mt-work/todo.txt b/mt-work/todo.txt
index 678d213..861013d 100644
--- a/mt-work/todo.txt
+++ b/mt-work/todo.txt
@@ -23,8 +23,9 @@ field pictures in the same packet are not optimal. Modify the
 nals_needed check so that the second field's first slice is
 considered as needed, then uncomment the FIXME code in decode_postinit.
 Ex: http://astrange.ithinksw.net/ffmpeg/mt-samples/PAFF-Chalet-Tire.mp4
-- The conformance sample MR3_TANDBERG_B.264 has problems (allocated picture overflow).
-- One 10-bit sample has problems.
+- The code added to shorten frame gaps (to avoid allocating more than 16 new frames)
+appears to be wrong by inspection. It does not handle prev_frame_num > frame_num,
+and "h->frame_num - h->sps.ref_frame_count - 1" should be "h->frame_num - h->sps.ref_frame_count".
 
 mpeg4:
 - Packed B-frames need to be explicitly split up



More information about the ffmpeg-cvslog mailing list