commit 98448a6349c3804b4232aa8260c707bf82fb56cc
author Lajos Molnar <lajos@google.com> Wed Apr 29 15:37:21 2020 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Apr 29 15:37:21 2020 +0000
tree a013b3303b65175a2aa90c5a789c8e7fc81b044b
parent dc90c17bdccc472935d51338b1581af7b89a5d27
parent f8f9e3d9affbbf95cbdcfeaecc6a189464f6e492

Merge "media: further miscellaneous fixes to VT contribution"

media/libmediaplayerservice/Android.bp

diff --git a/media/libmediaplayerservice/Android.bp b/media/libmediaplayerservice/Android.bp
index 902d846..324f4ae 100644
--- a/media/libmediaplayerservice/Android.bp
+++ b/media/libmediaplayerservice/Android.bp
@@ -16,7 +16,6 @@
         "android.hardware.media.c2@1.0",
         "android.hardware.media.omx@1.0",
         "libbase",
-        "libandroid",
         "libandroid_net",
         "libaudioclient",
         "libbinder",

media/libmediaplayerservice/nuplayer/Android.bp

diff --git a/media/libmediaplayerservice/nuplayer/Android.bp b/media/libmediaplayerservice/nuplayer/Android.bp
index 7206eab..f5e44c7 100644
--- a/media/libmediaplayerservice/nuplayer/Android.bp
+++ b/media/libmediaplayerservice/nuplayer/Android.bp
@@ -48,8 +48,6 @@
     },
 
     shared_libs: [
-        "libandroid",
-        "libandroid_net",
         "libbinder",
         "libdatasource",
         "libui",

media/libstagefright/rtsp/ASessionDescription.cpp

diff --git a/media/libstagefright/rtsp/ASessionDescription.cpp b/media/libstagefright/rtsp/ASessionDescription.cpp
index 4502f62..5b5b4b1 100644
--- a/media/libstagefright/rtsp/ASessionDescription.cpp
+++ b/media/libstagefright/rtsp/ASessionDescription.cpp
@@ -27,6 +27,8 @@
 
 namespace android {
 
+constexpr unsigned kDefaultAs = 960; // kbps?
+
 ASessionDescription::ASessionDescription()
     : mIsValid(false) {
 }
@@ -401,7 +403,7 @@
     sdp.append("\r\n");
 
     sdp.append("b=AS:");
-    sdp.append(as > 0 ? as : 960);
+    sdp.append(as > 0 ? as : kDefaultAs);
     sdp.append("\r\n");
 
     sdp.append("a=rtpmap:");
@@ -420,7 +422,7 @@
         sdp.append("\r\n");
     }
 
-    if (width > 0 && height > 0) {
+    if (!isAudio && width > 0 && height > 0) {
         sdp.append("a=framesize:");
         sdp.append(payloadType);
         sdp.append(" ");

media/libstagefright/rtsp/Android.bp

diff --git a/media/libstagefright/rtsp/Android.bp b/media/libstagefright/rtsp/Android.bp
index 84a47af..6179142 100644
--- a/media/libstagefright/rtsp/Android.bp
+++ b/media/libstagefright/rtsp/Android.bp
@@ -22,7 +22,6 @@
     ],
 
     shared_libs: [
-        "libandroid",
         "libandroid_net",
         "libcrypto",
         "libdatasource",