Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 35430080 authored by android-build-team Robot's avatar android-build-team Robot
Browse files

release-request-70e541de-d91e-4004-8c17-3147135eff42-for-git_oc-dr1-release-39... 

release-request-70e541de-d91e-4004-8c17-3147135eff42-for-git_oc-dr1-release-3993143 snap-temp-L23100000062404817

Change-Id: Id99f7cdfb62a0675825c806e9112d04a186ea438
parents 4fc652ca 9ee3885b

camera/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -61,6 +61,7 @@ cc_library_shared { 
        "libbinder",

        "libgui",

        "libcamera_metadata",

        "libnativewindow",

    ],



    include_dirs: [

media/libmedia/Android.bp

+3 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ cc_library { 
        "-Wall",

    ],

    shared: {

      shared_libs: ["libutils", "liblog"],

      shared_libs: ["libutils", "liblog", "libgui"],

    },

    clang: true,

}
@@ -115,6 +115,8 @@ cc_library_shared { 


    export_shared_lib_headers: [

        "libbinder",

        "libicuuc",

        "libicui18n",

        "libsonivox",

        "libmediadrm",

        "android.hidl.token@1.0-utils",

media/libmedia/include/media/OMXBuffer.h

+0 −1
Original line number Diff line number Diff line
@@ -19,7 +19,6 @@ 


#include <cutils/native_handle.h>

#include <media/IOMX.h>

#include <system/window.h>

#include <utils/StrongPointer.h>

#include <hidl/HidlSupport.h>

media/libmedia/xml/media_profiles_V1_0.dtd

+6 −6
Original line number Diff line number Diff line 
<!ELEMENT MediaSettings (CamcorderProfiles,

<!ELEMENT MediaSettings (CamcorderProfiles+,

                         EncoderOutputFileFormat+,

                         VideoEncoderCap+,

                         AudioEncoderCap+,

                         VideoDecoderCap,

                         AudioDecoderCap)>

<!ELEMENT CamcorderProfiles (EncoderProfile+, ImageEncoding+, ImageDecoding, Camera)>

<!ELEMENT CamcorderProfiles (EncoderProfile|ImageEncoding|ImageDecoding|Camera)+>

<!ATTLIST CamcorderProfiles cameraId (0|1) #REQUIRED>

<!ELEMENT EncoderProfile (Video, Audio)>

<!ATTLIST EncoderProfile quality (high|low) #REQUIRED>

<!ATTLIST EncoderProfile quality CDATA #REQUIRED>

<!ATTLIST EncoderProfile fileFormat (mp4|3gp) #REQUIRED>

<!ATTLIST EncoderProfile duration (30|60) #REQUIRED>

<!ATTLIST EncoderProfile cameraId (0|1) #REQUIRED>

<!ELEMENT Video EMPTY>

<!ATTLIST Video codec (h264|h263|m4v) #REQUIRED>

<!ATTLIST Video bitRate CDATA #REQUIRED>
@@ -22,7 +22,7 @@ 
<!ATTLIST Audio sampleRate CDATA #REQUIRED>

<!ATTLIST Audio channels (1|2) #REQUIRED>

<!ELEMENT ImageEncoding EMPTY>

<!ATTLIST ImageEncoding quality (90|80|70|60|50|40) #REQUIRED>

<!ATTLIST ImageEncoding quality (95|90|80|70|60|50|40) #REQUIRED>

<!ELEMENT ImageDecoding EMPTY>

<!ATTLIST ImageDecoding memCap CDATA #REQUIRED>

<!ELEMENT Camera EMPTY>
@@ -40,7 +40,7 @@ 
<!ATTLIST VideoEncoderCap minFrameRate CDATA #REQUIRED>

<!ATTLIST VideoEncoderCap maxFrameRate CDATA #REQUIRED>

<!ELEMENT AudioEncoderCap EMPTY>

<!ATTLIST AudioEncoderCap name (amrnb|amrwb|aac|wma) #REQUIRED>

<!ATTLIST AudioEncoderCap name (amrnb|amrwb|aac|wma|heaac|aaceld) #REQUIRED>

<!ATTLIST AudioEncoderCap enabled (true|false) #REQUIRED>

<!ATTLIST AudioEncoderCap minBitRate CDATA #REQUIRED>

<!ATTLIST AudioEncoderCap maxBitRate CDATA #REQUIRED>

media/libmediaplayerservice/nuplayer/NuPlayerRenderer.cpp

+7 −0
Original line number Diff line number Diff line
@@ -1010,6 +1010,13 @@ bool NuPlayer::Renderer::onDrainAudioQueue() { 
            }



            // EOS

            if (mPaused) {

                // Do not notify EOS when paused.

                // This is needed to avoid switch to next clip while in pause.

                ALOGV("onDrainAudioQueue(): Do not notify EOS when paused");

                return false;

            }



            int64_t postEOSDelayUs = 0;

            if (mAudioSink->needsTrailingPadding()) {

                postEOSDelayUs = getPendingAudioPlayoutDurationUs(ALooper::GetNowUs());