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

Commit 187dcc50 authored by Harish Mahendrakar's avatar Harish Mahendrakar Committed by Ray Essick
Browse files

libstagefright: Move OpusHeader files to libstagefright_foundation 

Now OpusHeader.cpp is part of libstagefright_foundation.
This avoids a need to include libstagefright_opus_common as an
additional shared library

Bug: 115576456
Test: Tested with a Ogg writer using a local AMediaMuxer
 based application

Change-Id: I102492676447c9f3677e2d418bd39d274ad4f392
parent 04a71420

media/libstagefright/Android.bp

+0 −1
Original line number Diff line number Diff line
@@ -160,7 +160,6 @@ cc_library { 
        "libstagefright_codecbase",

        "libstagefright_foundation",

        "libstagefright_omx_utils",

        "libstagefright_opus_common",

        "libRScpp",

        "libhidlallocatorutils",

        "libhidlbase",

media/libstagefright/OggWriter.cpp

+1 −1
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ 
#include <media/stagefright/MetaData.h>

#include <media/stagefright/OggWriter.h>

#include <media/stagefright/foundation/ADebug.h>

#include "OpusHeader.h"

#include <media/stagefright/foundation/OpusHeader.h>



extern "C" {

#include <ogg/ogg.h>

media/libstagefright/foundation/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -72,6 +72,7 @@ cc_defaults { 
        "MediaKeys.cpp",

        "MetaData.cpp",

        "MetaDataBase.cpp",

        "OpusHeader.cpp",

        "avc_utils.cpp",

        "base64.cpp",

        "hexdump.cpp",

media/libstagefright/opus/OpusHeader.cpp→media/libstagefright/foundation/OpusHeader.cpp

+0 −6
Original line number Diff line number Diff line
@@ -43,9 +43,6 @@ constexpr uint8_t kOpusChannelMap[kMaxChannels][kMaxChannels] = { 
        {0, 6, 1, 2, 3, 4, 5, 7},

};



// Opus always has a 48kHz output rate. This is true for all Opus, not just this

// implementation.

constexpr int kRate = 48000;

// Size of the Opus header excluding optional mapping information.

constexpr size_t kOpusHeaderSize = 19;

// Offset to magic string that starts Opus header.
@@ -76,15 +73,12 @@ constexpr size_t kOpusHeaderNumStreamsOffset = 19; 
constexpr size_t kOpusHeaderNumCoupledStreamsOffset = 20;

// Offset to the stream to channel mapping in the Opus header.

constexpr size_t kOpusHeaderStreamMapOffset = 21;

// Maximum packet size used in Xiph's opusdec.

constexpr int kMaxOpusOutputPacketSizeSamples = 960 * 6;



// Default audio output channel layout. Used to initialize |stream_map| in

// OpusHeader, and passed to opus_multistream_decoder_create() when the header

// does not contain mapping information. The values are valid only for mono and

// stereo output: Opus streams with more than 2 channels require a stream map.

constexpr int kMaxChannelsWithDefaultLayout = 2;

constexpr uint8_t kDefaultOpusChannelLayout[kMaxChannelsWithDefaultLayout] = {0, 1};



static uint16_t ReadLE16(const uint8_t* data, size_t data_size, uint32_t read_offset) {

    // check whether the 2nd byte is within the buffer