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

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

Snap for 6188643 from 18be1332 to rvc-release 

Change-Id: I5155bdaf03c2c7e4b1eed5322a07671ed66fb1f7
parents 5295e44d 18be1332

apex/testing/Android.bp

+2 −2
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ 
// See the License for the specific language governing permissions and

// limitations under the License.



apex {

apex_test {

    name: "test_com.android.media",

    manifest: "test_manifest.json",

    file_contexts: ":com.android.media-file_contexts",
@@ -20,7 +20,7 @@ apex { 
    installable: false,

}



apex {

apex_test {

    name: "test_com.android.media.swcodec",

    manifest: "test_manifest_codec.json",

    file_contexts: ":com.android.media.swcodec-file_contexts",

camera/include/camera/VendorTagDescriptor.h

+2 −2
Original line number Diff line number Diff line
@@ -188,8 +188,8 @@ class VendorTagDescriptorCache : public Parcelable { 
            sp<android::VendorTagDescriptor> *desc /*out*/);



    // Parcelable interface

    status_t writeToParcel(Parcel* parcel) const override;

    status_t readFromParcel(const Parcel* parcel) override;

    status_t writeToParcel(android::Parcel* parcel) const override;

    status_t readFromParcel(const android::Parcel* parcel) override;



    // Returns the number of vendor tags defined.

    int getTagCount(metadata_vendor_id_t id) const;

media/codec2/sfplugin/CCodecBufferChannel.cpp

+6 −4
Original line number Diff line number Diff line
@@ -1263,10 +1263,12 @@ status_t CCodecBufferChannel::start( 
        }



        if (oStreamFormat.value == C2BufferData::LINEAR) {

            if (buffersBoundToCodec) {

                // WORKAROUND: if we're using early CSD workaround we convert to

                //             array mode, to appease apps assuming the output

                //             buffers to be of the same size.

                output->buffers = output->buffers->toArrayMode(numOutputSlots);

            }



            int32_t channelCount;

            int32_t sampleRate;

media/libaaudio/include/aaudio/AAudio.h

+4 −0
Original line number Diff line number Diff line
@@ -1030,6 +1030,10 @@ AAUDIO_API aaudio_result_t AAudioStreamBuilder_delete(AAudioStreamBuilder* buil 
 *

 * After this call, the stream will be in {@link #AAUDIO_STREAM_STATE_CLOSING}

 *

 * This function is useful if you want to release the audio resources immediately,

 * but still allow queries to the stream to occur from other threads. This often

 * happens if you are monitoring stream progress from a UI thread.

 *

 * @param stream reference provided by AAudioStreamBuilder_openStream()

 * @return {@link #AAUDIO_OK} or a negative error.

 */

media/libmediametrics/include/MediaMetricsConstants.h

+9 −2
Original line number Diff line number Diff line
@@ -70,14 +70,21 @@ 
// Underscores after the AMEDIAMETRICS_PROP_* prefix indicate

// a "dot" in the property name. For example AMEDIAMETRICS_PROP_VOLUME_LEFT

// corresponds to "volume.left".



//

// The property names are camel case, typically a lowercase letter [a-z]

// followed by one or more characters in the range [a-zA-Z0-9_.].

// Special symbols such as !@#$%^&*()[]{}<>,:;'"\/?|+-=~ are reserved.

//

// A property that ends with a ! will have duplicate values listed instead

// of suppressed in the Time Machine.

//

#define AMEDIAMETRICS_PROP_AUXEFFECTID    "auxEffectId"    // int32 (AudioTrack)

#define AMEDIAMETRICS_PROP_CHANNELCOUNT   "channelCount"   // int32

#define AMEDIAMETRICS_PROP_CHANNELMASK    "channelMask"    // int32

#define AMEDIAMETRICS_PROP_CONTENTTYPE    "contentType"    // string attributes (AudioTrack)

#define AMEDIAMETRICS_PROP_DURATIONNS     "durationNs"     // int64 duration time span

#define AMEDIAMETRICS_PROP_ENCODING       "encoding"       // string value of format

#define AMEDIAMETRICS_PROP_EVENT          "event"          // string value (often func name)

#define AMEDIAMETRICS_PROP_EVENT          "event!"         // string value (often func name)



// TODO: fix inconsistency in flags: AudioRecord / AudioTrack int32,  AudioThread string

#define AMEDIAMETRICS_PROP_FLAGS          "flags"