Re: [FFmpeg-devel] [PATCH] lavc/mediacodecdec_h264: fix SODB escaping

[Matthieu Bouron]

On Wed, Sep 07, 2016 at 02:50:18PM +0200, Benoit Fouet wrote:
> Hi,
> 
> 
> On 06/09/2016 16:53, Matthieu Bouron wrote:
> > From: Matthieu Bouron 
> > 
> > Fixes escaping of consecutive 0x00, 0x00, 0x0{0-3} sequences.
> > ---
> >   libavcodec/mediacodecdec_h264.c | 6 +++---
> >   1 file changed, 3 insertions(+), 3 deletions(-)
> > 
> > diff --git a/libavcodec/mediacodecdec_h264.c 
> > b/libavcodec/mediacodecdec_h264.c
> > index a141174..4f9d737 100644
> > --- a/libavcodec/mediacodecdec_h264.c
> > +++ b/libavcodec/mediacodecdec_h264.c
> > @@ -104,9 +104,9 @@ static int h264_ps_to_nalu(const uint8_t *src, int 
> > src_size, uint8_t **out, int
> >   }
> >   *out = p = new;
> > -i = i + 3;
> > -memmove(p + i, p + i - 1, *out_size - i);
> > -p[i - 1] = 0x03;
> > +i = i + 2;
> > +memmove(p + i + 1, p + i, *out_size - (i + 1));
> > +p[i] = 0x03;
> 
> LGTM

Pushed. Thanks for the review.

Matthieu

[...]
___
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel

Re: [FFmpeg-devel] [PATCH] lavc/mediacodecdec_h264: fix SODB escaping

[Benoit Fouet]

Hi,


On 06/09/2016 16:53, Matthieu Bouron wrote:

From: Matthieu Bouron 

Fixes escaping of consecutive 0x00, 0x00, 0x0{0-3} sequences.
---
  libavcodec/mediacodecdec_h264.c | 6 +++---
  1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/libavcodec/mediacodecdec_h264.c b/libavcodec/mediacodecdec_h264.c
index a141174..4f9d737 100644
--- a/libavcodec/mediacodecdec_h264.c
+++ b/libavcodec/mediacodecdec_h264.c
@@ -104,9 +104,9 @@ static int h264_ps_to_nalu(const uint8_t *src, int 
src_size, uint8_t **out, int
  }
  *out = p = new;
  
-i = i + 3;

-memmove(p + i, p + i - 1, *out_size - i);
-p[i - 1] = 0x03;
+i = i + 2;
+memmove(p + i + 1, p + i, *out_size - (i + 1));
+p[i] = 0x03;


LGTM

--
Ben

___
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel