From 8d0faeb5d659203dea417c772b7468baff09e484 Mon Sep 17 00:00:00 2001 From: Marcel Partap Date: Thu, 13 Sep 2018 09:48:08 +0200 Subject: [PATCH 1/3] Moved the media codecs list to android/media/ as it also contains audio codecs. --- android/{camera => media}/media_codecs.xml | 0 android/{camera => media}/media_profiles.xml | 0 products/anbox.mk | 4 ++-- 3 files changed, 2 insertions(+), 2 deletions(-) rename android/{camera => media}/media_codecs.xml (100%) rename android/{camera => media}/media_profiles.xml (100%) diff --git a/android/camera/media_codecs.xml b/android/media/media_codecs.xml similarity index 100% rename from android/camera/media_codecs.xml rename to android/media/media_codecs.xml diff --git a/android/camera/media_profiles.xml b/android/media/media_profiles.xml similarity index 100% rename from android/camera/media_profiles.xml rename to android/media/media_profiles.xml diff --git a/products/anbox.mk b/products/anbox.mk index 73fd1a9..109634d 100644 --- a/products/anbox.mk +++ b/products/anbox.mk @@ -43,8 +43,8 @@ PRODUCT_COPY_FILES += \ vendor/anbox/android/init.goldfish.rc:root/init.goldfish.rc \ vendor/anbox/android/init.goldfish.sh:system/etc/init.goldfish.sh \ vendor/anbox/android/ueventd.goldfish.rc:root/ueventd.goldfish.rc \ - vendor/anbox/android/camera/media_profiles.xml:system/etc/media_profiles.xml \ - vendor/anbox/android/camera/media_codecs.xml:system/etc/media_codecs.xml \ + vendor/anbox/android/media/media_profiles.xml:system/etc/media_profiles.xml \ + vendor/anbox/android/media/media_codecs.xml:system/etc/media_codecs.xml \ hardware/libhardware_legacy/audio/audio_policy.conf:system/etc/audio_policy.conf PRODUCT_CHARACTERISTICS := emulator From c98fe4b3a23ad39597f7e6ad2b8da0ed217c609f Mon Sep 17 00:00:00 2001 From: Marcel Partap Date: Thu, 13 Sep 2018 10:02:38 +0200 Subject: [PATCH 2/3] Added missing media_codecs_google_*.xml from frameworks/av libstagefright (tree 6b14452cfef637b9b987c0a6a690bda7067afe49). Upstream location is https://android.googlesource.com/platform/frameworks/av/+/master/media/libstagefright/data --- android/media/media_codecs_google_audio.xml | 97 ++++++++++++++ .../media/media_codecs_google_telephony.xml | 25 ++++ android/media/media_codecs_google_video.xml | 122 ++++++++++++++++++ products/anbox.mk | 3 + 4 files changed, 247 insertions(+) create mode 100644 android/media/media_codecs_google_audio.xml create mode 100644 android/media/media_codecs_google_telephony.xml create mode 100644 android/media/media_codecs_google_video.xml diff --git a/android/media/media_codecs_google_audio.xml b/android/media/media_codecs_google_audio.xml new file mode 100644 index 0000000..632088a --- /dev/null +++ b/android/media/media_codecs_google_audio.xml @@ -0,0 +1,97 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/android/media/media_codecs_google_telephony.xml b/android/media/media_codecs_google_telephony.xml new file mode 100644 index 0000000..5ad90d9 --- /dev/null +++ b/android/media/media_codecs_google_telephony.xml @@ -0,0 +1,25 @@ + + + + + + + + + + + + diff --git a/android/media/media_codecs_google_video.xml b/android/media/media_codecs_google_video.xml new file mode 100644 index 0000000..829f403 --- /dev/null +++ b/android/media/media_codecs_google_video.xml @@ -0,0 +1,122 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/products/anbox.mk b/products/anbox.mk index 109634d..9a2d7c5 100644 --- a/products/anbox.mk +++ b/products/anbox.mk @@ -45,6 +45,9 @@ PRODUCT_COPY_FILES += \ vendor/anbox/android/ueventd.goldfish.rc:root/ueventd.goldfish.rc \ vendor/anbox/android/media/media_profiles.xml:system/etc/media_profiles.xml \ vendor/anbox/android/media/media_codecs.xml:system/etc/media_codecs.xml \ + vendor/anbox/android/media/media_codecs_google_audio.xml:system/etc/media_codecs_google_audio.xml \ + vendor/anbox/android/media/media_codecs_google_telephony.xml:system/etc/media_codecs_google_telephony.xml \ + vendor/anbox/android/media/media_codecs_google_video.xml:system/etc/media_codecs_google_video.xml \ hardware/libhardware_legacy/audio/audio_policy.conf:system/etc/audio_policy.conf PRODUCT_CHARACTERISTICS := emulator From 05cb1a608e6c690ca393858ab786d780a4d62a82 Mon Sep 17 00:00:00 2001 From: Marcel Partap Date: Thu, 13 Sep 2018 10:04:04 +0200 Subject: [PATCH 3/3] Also add mpeg2 support. (frameworks/av commit c83d228e85b187e3112f10003282c8270d18ef71 moved this from media_codecs_google_video.xml to new file media_codecs_google_tv.xml for reasons not given.) --- android/media/media_codecs.xml | 1 + android/media/media_codecs_google_tv.xml | 29 ++++++++++++++++++++++++ products/anbox.mk | 1 + 3 files changed, 31 insertions(+) create mode 100644 android/media/media_codecs_google_tv.xml diff --git a/android/media/media_codecs.xml b/android/media/media_codecs.xml index 87d11f2..ee846da 100644 --- a/android/media/media_codecs.xml +++ b/android/media/media_codecs.xml @@ -80,5 +80,6 @@ Only the three quirks included above are recognized at this point: + diff --git a/android/media/media_codecs_google_tv.xml b/android/media/media_codecs_google_tv.xml new file mode 100644 index 0000000..330c6fb --- /dev/null +++ b/android/media/media_codecs_google_tv.xml @@ -0,0 +1,29 @@ + + + + + + + + + + + + + + + + diff --git a/products/anbox.mk b/products/anbox.mk index 9a2d7c5..6ab2330 100644 --- a/products/anbox.mk +++ b/products/anbox.mk @@ -47,6 +47,7 @@ PRODUCT_COPY_FILES += \ vendor/anbox/android/media/media_codecs.xml:system/etc/media_codecs.xml \ vendor/anbox/android/media/media_codecs_google_audio.xml:system/etc/media_codecs_google_audio.xml \ vendor/anbox/android/media/media_codecs_google_telephony.xml:system/etc/media_codecs_google_telephony.xml \ + vendor/anbox/android/media/media_codecs_google_tv.xml:system/etc/media_codecs_google_tv.xml \ vendor/anbox/android/media/media_codecs_google_video.xml:system/etc/media_codecs_google_video.xml \ hardware/libhardware_legacy/audio/audio_policy.conf:system/etc/audio_policy.conf