[FFmpeg-devel] Google Summer of Code participation

[Michael Niedermayer]

On Tue, Apr 07, 2009 at 08:40:45PM +0200, Thilo Borgmann wrote:
>
>
> Ronald S. Bultje schrieb:
>> Hi,
>>
>> On Tue, Apr 7, 2009 at 10:15 AM, Michael Niedermayer <michaelni at gmx.at> 
>> wrote:
>>   
>>> On Tue, Apr 07, 2009 at 02:51:08PM +0200, Thilo Borgmann wrote:
>>>     
>>>> Ronald S. Bultje schrieb:
>>>>       
>>>>> @@ -89,7 +92,9 @@ static int sp5x_decode_frame(AVCodecContext *avctx,
>>>>>      recoded[j++] = 0xD9;
>>>>>
>>>>>      avctx->flags &= ~CODEC_FLAG_EMU_EDGE;
>>>>> -    i = ff_mjpeg_decode_frame(avctx, data, data_size, recoded, j);
>>>>> +    avpkt_recoded.data = recoded;
>>>>> +    avpkt_recoded.size = j;
>>>>> +    i = ff_mjpeg_decode_frame(avctx, data, data_size, &avpkt_recoded);
>>>>>
>>>>>      av_free(recoded);
>>>>>
>>>>> That leaves some fields uninitialized, you should use av_init_packet()
>>>>> here also.
>>>>>         
>> [..]
>>   
>>>> OK, added the init function in revision 7.
>>>>       
>> [..]
>>   
>>> tabs
>>>     
>>
>> Well yeah, applied without that. Good work, Thilo! I'll apply your
>> last patch (moving of av_packet_*() functions) after lunch.
>>
>>
>>   
> Thanks to you and the other reviewers! ...And I was just about to mail 
> revision 8 without that tab :)
> To be correct, I attached revision 8, too, just for the case that revision 
> 7 has not been applied.

they break vp6 decoding

[...]

> diff --git a/ffmpeg.c b/ffmpeg.c
> index cb15120..a35f282 100644
> --- a/ffmpeg.c
> +++ b/ffmpeg.c
> @@ -1224,8 +1224,8 @@ static int output_packet(AVInputStream *ist, int ist_index,
>                  data_size= samples_size;
>                      /* XXX: could avoid copy if PCM 16 bits with same
>                         endianness as CPU */
> -                ret = avcodec_decode_audio2(ist->st->codec, samples, &data_size,
> -                                           ptr, len);
> +                ret = avcodec_decode_audio3(ist->st->codec, samples, &data_size,
> +                                           pkt);
>                  if (ret < 0)
>                      goto fail_decode;
>                  ptr += ret;

this looks wrong

[...]
-- 
Michael     GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB

Into a blind darkness they enter who follow after the Ignorance,
they as if into a greater darkness enter who devote themselves
to the Knowledge alone. -- Isha Upanishad
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: Digital signature
URL: <http://lists.mplayerhq.hu/pipermail/ffmpeg-devel/attachments/20090407/56dafa61/attachment.pgp>