[FFmpeg-devel] [PATCH v2 2/3] vaapi: streamline public context structure.

Gwenole Beauchesne gb.devel at gmail.com
Wed Aug 19 16:23:10 CEST 2015


Hi,

2015-08-19 16:12 GMT+02:00 Michael Niedermayer <michael at niedermayer.cc>:
> On Wed, Aug 19, 2015 at 11:03:05AM +0200, Gwenole Beauchesne wrote:
>> Move libavcodec managed objects from the public struct vaapi_context
>> to a new privately owned FFVAContext. This is done so that to clean up
>> and streamline the public structure, but also to prepare for new codec
>> support, thus requiring new internal data to be added in there.
>>
>> The AVCodecContext.hwaccel_context, that holds the public vaapi_context,
>> shall no longer be accessed from within vaapi_*.c codec support files.
>>
>> v2: add one minor check for hwaccel_context existence, mark older
>>   vaapi_context fields as deprecated until we reach lavc major+2,
>>   amend doc/APIchanges.
>>
>> Signed-off-by: Gwenole Beauchesne <gwenole.beauchesne at intel.com>
>> ---
>>  doc/APIchanges              |  4 ++++
>>  libavcodec/vaapi.c          | 40 +++++++++++++++++++++++++++++++---------
>>  libavcodec/vaapi.h          | 16 ++++++++++++++++
>>  libavcodec/vaapi_h264.c     | 10 +++++++---
>>  libavcodec/vaapi_internal.h | 42 ++++++++++++++++++++++++++++++++++++------
>>  libavcodec/vaapi_mpeg2.c    |  8 ++++++--
>>  libavcodec/vaapi_mpeg4.c    | 11 +++++++++--
>>  libavcodec/vaapi_vc1.c      | 11 +++++++++--
>>  libavcodec/version.h        |  3 +++
>>  9 files changed, 121 insertions(+), 24 deletions(-)
> [...]
>
>> diff --git a/libavcodec/vaapi.h b/libavcodec/vaapi.h
>> index 815a27e..4448a2e 100644
>> --- a/libavcodec/vaapi.h
>> +++ b/libavcodec/vaapi.h
>> @@ -31,6 +31,8 @@
>>   */
>>
>>  #include <stdint.h>
>> +#include <libavutil/attributes.h>
>> +#include "version.h"
>
> is this intended to be <libavutil/attributes.h> and not "libavutil/attributes.h" ?

You are right. There are also other includes to fix. Though, I have
only removed the one that I was too bored to see hanging around. I
will fix.

Thanks,
-- 
Gwenole Beauchesne
Intel Corporation SAS / 2 rue de Paris, 92196 Meudon Cedex, France
Registration Number (RCS): Nanterre B 302 456 199


More information about the ffmpeg-devel mailing list