[Merge] ~vicamo/avila-private/+git/platform_frameworks_av:bug-1619107/media-service-for-32-bit-codecs into ~avila-private-team/avila-private/+git/platform_frameworks_av:ubuntu

[Alfonso Sanchez-Beato]

Diff comments:

> diff --git a/media/libmedia/IMediaCodecList.cpp b/media/libmedia/IMediaCodecList.cpp
> index bf7c5ca..361851f 100644
> --- a/media/libmedia/IMediaCodecList.cpp
> +++ b/media/libmedia/IMediaCodecList.cpp
> @@ -52,13 +54,22 @@ public:
>  
>      virtual sp<MediaCodecInfo> getCodecInfo(size_t index) const
>      {
> +        if ((mCodecInfos.size() > index) && (mCodecInfos[index] != NULL)) {

Did not read the commit message, +1 here.

> +            return mCodecInfos[index];
> +        }
> +
>          Parcel data, reply;
>          data.writeInterfaceToken(IMediaCodecList::getInterfaceDescriptor());
>          data.writeInt32(index);
>          remote()->transact(GET_CODEC_INFO, data, &reply);
>          status_t err = reply.readInt32();
>          if (err == OK) {
> -            return MediaCodecInfo::FromParcel(reply);
> +            sp<MediaCodecInfo> info = MediaCodecInfo::FromParcel(reply);
> +            if (index >= mCodecInfos.size()) {
> +                mCodecInfos.resize(index + 1);
> +            }
> +            mCodecInfos.replaceAt(info, index);
> +            return info;
>          } else {
>              return NULL;
>          }


-- 
https://code.launchpad.net/~vicamo/avila-private/+git/platform_frameworks_av/+merge/308820
Your team Ubuntu Phablet Team is requested to review the proposed merge of ~vicamo/avila-private/+git/platform_frameworks_av:bug-1619107/media-service-for-32-bit-codecs into ~avila-private-team/avila-private/+git/platform_frameworks_av:ubuntu.