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

Commit 66729b83 authored by Kris Alder's avatar Kris Alder Committed by Automerger Merge Worker
Browse files

Merge "Added httplive_fuzzer" am: f6207a3d am: 26486f1f 

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1737439

Change-Id: Id41163264361bb8012bc3d8ecb0b772139149fac
parents 8ec86a71 26486f1f

media/libstagefright/httplive/Android.bp

+7 −1
Original line number Diff line number Diff line
@@ -29,7 +29,6 @@ cc_library { 
    ],



    include_dirs: [

        "frameworks/av/media/libstagefright",

        "frameworks/native/include/media/openmax",

    ],
@@ -65,6 +64,8 @@ cc_library { 


    header_libs: [

        "libbase_headers",

        "libstagefright_headers",

        "libstagefright_httplive_headers",

    ],



    static_libs: [
@@ -74,3 +75,8 @@ cc_library { 
    ],



}



cc_library_headers {

    name: "libstagefright_httplive_headers",

    export_include_dirs: ["."],

}

media/libstagefright/httplive/LiveSession.cpp

+1 −1
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ 
#include "M3UParser.h"

#include "PlaylistFetcher.h"



#include "mpeg2ts/AnotherPacketSource.h"

#include <AnotherPacketSource.h>



#include <cutils/properties.h>

#include <media/MediaHTTPService.h>

media/libstagefright/httplive/LiveSession.h

+1 −1
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ 


#include <utils/String8.h>



#include "mpeg2ts/ATSParser.h"

#include <ATSParser.h>



namespace android {

media/libstagefright/httplive/PlaylistFetcher.cpp

+3 −3
Original line number Diff line number Diff line
@@ -24,9 +24,9 @@ 
#include "HTTPDownloader.h"

#include "LiveSession.h"

#include "M3UParser.h"

#include "include/ID3.h"

#include "mpeg2ts/AnotherPacketSource.h"

#include "mpeg2ts/HlsSampleDecryptor.h"

#include <ID3.h>

#include <AnotherPacketSource.h>

#include <HlsSampleDecryptor.h>



#include <datasource/DataURISource.h>

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

media/libstagefright/httplive/PlaylistFetcher.h

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

#include <openssl/aes.h>



#include "mpeg2ts/ATSParser.h"

#include <ATSParser.h>

#include "LiveSession.h"



namespace android {