[FFmpeg-devel] Google Summer of Code participation

[Michael Niedermayer]

On Sat, Apr 04, 2009 at 12:34:53PM +0200, Thilo Borgmann wrote:
>
>
> Michael Niedermayer schrieb:
>> On Fri, Apr 03, 2009 at 07:13:10PM +0200, Thilo Borgmann wrote:
>>   
>>
>> missing documentation,all public functions must be documentated
>>   
> All three documented now.
>
>> that looks like it is not against svn
>>   
> Oh yes, local issue solved now.
>
>>> -
>>>  /*
>>>   * Init kmvc decoder
>>>   */
>>>     
>>
>> cosmetic
>>     
> Made less beutiful again.
>
>> tabs
>>
>>   
> All removed now.
>>> index 3a90194..ec287b1 100644
>>> --- a/libavcodec/vp56.h
>>> +++ b/libavcodec/vp56.h
>>> @@ -173,6 +173,8 @@ int vp56_free(AVCodecContext *avctx);
>>>  void vp56_init_dequant(VP56Context *s, int quantizer);
>>>  int vp56_decode_frame(AVCodecContext *avctx, void *data, int *data_size,
>>>                        const uint8_t *buf, int buf_size);
>>> +int vp56_decode_frame2(AVCodecContext *avctx, void *data, int 
>>> *data_size,
>>> +                      AVPacket *avpkt);
>>>    /**
>>>     
>>
>> hmm
>>   
> Got the last two hiding. There should be none left now.
>
>
> Revision 3 attached.
[...]
> @@ -3018,24 +3017,40 @@ int avcodec_open(AVCodecContext *avctx, AVCodec *codec);
>  
>  /**
>   * Decodes an audio frame from \p buf into \p samples.
> - * The avcodec_decode_audio2() function decodes an audio frame from the input
> - * buffer \p buf of size \p buf_size. To decode it, it makes use of the
> + * Wrapper function which calls avcodec_decode_audio3.
> + *
> + * @param avctx the codec context
> + * @param[out] samples the output buffer
> + * @param[in,out] frame_size_ptr the output buffer size in bytes
> + * @param[in] buf the input buffer
> + * @param[in] buf_size the input buffer size in bytes
> + * @return On error a negative value is returned, otherwise the number of bytes
> + * used or zero if no frame could be decompressed.
> + */
> +int avcodec_decode_audio2(AVCodecContext *avctx, int16_t *samples,
> +                         int *frame_size_ptr,
> +                         const uint8_t *buf, int buf_size);
> +

the old should be marked deprecated


[...]
> @@ -3100,6 +3129,14 @@ int avcodec_decode_video(AVCodecContext *avctx, AVFrame *picture,
>  int avcodec_decode_subtitle(AVCodecContext *avctx, AVSubtitle *sub,
>                              int *got_sub_ptr,
>                              const uint8_t *buf, int buf_size);
> +
> +/* Decode a subtitle message. Return -1 if error, otherwise return the
> + * number of bytes used. If no subtitle could be decompressed,
> + * got_sub_ptr is zero. Otherwise, the subtitle is stored in *sub. */
> +int avcodec_decode_subtitle2(AVCodecContext *avctx, AVSubtitle *sub,
> +                            int *got_sub_ptr,
> +                            AVPacket *avpkt);
> +

this comment is not doxygen compatible

[...]
> diff --git a/libavcodec/fraps.c b/libavcodec/fraps.c
> index 14da1a0..92672bf 100644
> --- a/libavcodec/fraps.c
> +++ b/libavcodec/fraps.c
> @@ -130,8 +130,10 @@ static int fraps2_decode_plane(FrapsContext *s, uint8_t *dst, int stride, int w,
>   */
>  static int decode_frame(AVCodecContext *avctx,
>                          void *data, int *data_size,
> -                        const uint8_t *buf, int buf_size)
> +                        AVPacket *avpkt)
>  {
> +    const uint8_t *buf = avpkt->data;
> +    int buf_size = avpkt->size;
>      FrapsContext * const s = avctx->priv_data;
>      AVFrame *frame = data;
>      AVFrame * const f = (AVFrame*)&s->frame;

> @@ -345,7 +347,6 @@ static int decode_frame(AVCodecContext *avctx,
>      return buf_size;
>  }
>  
> -
>  /**
>   * closes decoder
>   * @param avctx codec context

cosmetic, are you actually looking at what you submit?


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

In a rich man's house there is no place to spit but his face.
-- Diogenes of Sinope
-------------- 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/20090404/e5d3566f/attachment.pgp>