From b45e5873303bae93207f85bfcf74eebf4caca5b4 Mon Sep 17 00:00:00 2001 From: Amarendra Kumar Pandey Date: Wed, 12 Jun 2019 11:47:37 +0530 Subject: [PATCH 01/18] Exception handling for profileIdc_100 --- .../ypresto/androidtranscoder/engine/MediaFormatValidator.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/src/main/java/net/ypresto/androidtranscoder/engine/MediaFormatValidator.java b/lib/src/main/java/net/ypresto/androidtranscoder/engine/MediaFormatValidator.java index 67ea5ba8..ebb1120c 100644 --- a/lib/src/main/java/net/ypresto/androidtranscoder/engine/MediaFormatValidator.java +++ b/lib/src/main/java/net/ypresto/androidtranscoder/engine/MediaFormatValidator.java @@ -26,6 +26,7 @@ class MediaFormatValidator { // Refer: http://en.wikipedia.org/wiki/H.264/MPEG-4_AVC#Profiles private static final byte PROFILE_IDC_BASELINE = 66; + private static final byte PROFILE_IDC_HI = 100; public static void validateVideoOutputFormat(MediaFormat format) { String mime = format.getString(MediaFormat.KEY_MIME); @@ -36,7 +37,7 @@ public static void validateVideoOutputFormat(MediaFormat format) { } ByteBuffer spsBuffer = AvcCsdUtils.getSpsBuffer(format); byte profileIdc = AvcSpsUtils.getProfileIdc(spsBuffer); - if (profileIdc != PROFILE_IDC_BASELINE) { + if (profileIdc != PROFILE_IDC_BASELINE && profileIdc != PROFILE_IDC_HI) { throw new InvalidOutputFormatException("Non-baseline AVC video profile is not supported by Android OS, actual profile_idc: " + profileIdc); } } From 8f81a84be078f5842332b5cbd1995efc85bea9e2 Mon Sep 17 00:00:00 2001 From: Amarendra Kumar Pandey Date: Wed, 12 Jun 2019 12:22:09 +0530 Subject: [PATCH 02/18] Update build.gradle --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index d3ff69d6..2540ef4c 100644 --- a/build.gradle +++ b/build.gradle @@ -5,7 +5,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:1.1.0' + classpath 'com.android.tools.build:gradle:3.0.1' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files From a30e86120794dcdd48c7165d3305cf89fdc356d0 Mon Sep 17 00:00:00 2001 From: Amarendra Kumar Pandey Date: Wed, 12 Jun 2019 12:23:45 +0530 Subject: [PATCH 03/18] Update build.gradle --- lib/build.gradle | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/build.gradle b/lib/build.gradle index 6f6f393f..ffa45ff5 100644 --- a/lib/build.gradle +++ b/lib/build.gradle @@ -11,12 +11,12 @@ apply plugin: 'com.android.library' apply plugin: 'bintray-release' android { - compileSdkVersion 21 - buildToolsVersion "21.1.2" + compileSdkVersion 27 + buildToolsVersion "28.1.2" defaultConfig { - minSdkVersion 18 - targetSdkVersion 21 + minSdkVersion 27 + targetSdkVersion 28 } buildTypes { From 0827f8812f0ca02623461a4f6c1479753ea9c954 Mon Sep 17 00:00:00 2001 From: Amarendra Kumar Pandey Date: Wed, 12 Jun 2019 12:42:09 +0530 Subject: [PATCH 04/18] Updated build.gradle --- lib/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/build.gradle b/lib/build.gradle index ffa45ff5..2db2f66d 100644 --- a/lib/build.gradle +++ b/lib/build.gradle @@ -12,7 +12,7 @@ apply plugin: 'bintray-release' android { compileSdkVersion 27 - buildToolsVersion "28.1.2" + buildToolsVersion "29.0.0" defaultConfig { minSdkVersion 27 From eaf7ba39b26f47c80bca412cc7dfd516e0064ef7 Mon Sep 17 00:00:00 2001 From: Amarendra Kumar Pandey Date: Wed, 12 Jun 2019 13:49:56 +0530 Subject: [PATCH 05/18] updated build.gradle --- lib/build.gradle | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/build.gradle b/lib/build.gradle index 2db2f66d..94baa8e6 100644 --- a/lib/build.gradle +++ b/lib/build.gradle @@ -1,6 +1,7 @@ buildscript { repositories { jcenter() + google() } dependencies { classpath 'com.novoda:bintray-release:0.2.4' From c8f3be06951d6cd0ea12081a287f2093aa705f95 Mon Sep 17 00:00:00 2001 From: Amarendra Kumar Pandey Date: Wed, 12 Jun 2019 14:07:39 +0530 Subject: [PATCH 06/18] Update build.gradle --- lib/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/build.gradle b/lib/build.gradle index 94baa8e6..f2777264 100644 --- a/lib/build.gradle +++ b/lib/build.gradle @@ -1,7 +1,7 @@ buildscript { repositories { - jcenter() google() + jcenter() } dependencies { classpath 'com.novoda:bintray-release:0.2.4' From f1936dce379ecc76012f79433aab2a0699a27c20 Mon Sep 17 00:00:00 2001 From: Amarendra Kumar Pandey Date: Wed, 12 Jun 2019 14:18:32 +0530 Subject: [PATCH 07/18] Updated build.gradle --- build.gradle | 3 +++ 1 file changed, 3 insertions(+) diff --git a/build.gradle b/build.gradle index 2540ef4c..a4397c64 100644 --- a/build.gradle +++ b/build.gradle @@ -2,6 +2,9 @@ buildscript { repositories { + maven { + url "https://maven.google.com" + } jcenter() } dependencies { From bef1062ce558b821e43bc3213f004fc5fe1b7c64 Mon Sep 17 00:00:00 2001 From: Amarendra Kumar Pandey Date: Wed, 12 Jun 2019 14:25:30 +0530 Subject: [PATCH 08/18] Update build.gradle --- example/build.gradle | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/example/build.gradle b/example/build.gradle index ca16dc00..daf7b254 100644 --- a/example/build.gradle +++ b/example/build.gradle @@ -1,13 +1,13 @@ apply plugin: 'com.android.application' android { - compileSdkVersion 19 - buildToolsVersion "19.1.0" + compileSdkVersion 27 + buildToolsVersion "28" defaultConfig { applicationId "net.ypresto.androidtranscoder.example" - minSdkVersion 18 - targetSdkVersion 19 + minSdkVersion 27 + targetSdkVersion 28 versionCode 1 versionName "1.0" } From ae053c4eb778dbfc3473fa1d7e7c46fdc20f8fa0 Mon Sep 17 00:00:00 2001 From: Amarendra Kumar Pandey Date: Wed, 12 Jun 2019 14:38:11 +0530 Subject: [PATCH 09/18] Update build.gradle --- build.gradle | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/build.gradle b/build.gradle index a4397c64..d3ff69d6 100644 --- a/build.gradle +++ b/build.gradle @@ -2,13 +2,10 @@ buildscript { repositories { - maven { - url "https://maven.google.com" - } jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:3.0.1' + classpath 'com.android.tools.build:gradle:1.1.0' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files From 46e4ff04e1c184864918ead77775fa8fb8ae94b0 Mon Sep 17 00:00:00 2001 From: Amarendra Kumar Pandey Date: Wed, 12 Jun 2019 14:45:00 +0530 Subject: [PATCH 10/18] Update build.gradle --- lib/build.gradle | 1 - 1 file changed, 1 deletion(-) diff --git a/lib/build.gradle b/lib/build.gradle index f2777264..2db2f66d 100644 --- a/lib/build.gradle +++ b/lib/build.gradle @@ -1,6 +1,5 @@ buildscript { repositories { - google() jcenter() } dependencies { From cab0bdb24aa60610c08fe235969683b72b69dc3a Mon Sep 17 00:00:00 2001 From: Amarendra Kumar Pandey Date: Wed, 12 Jun 2019 14:57:27 +0530 Subject: [PATCH 11/18] Update build.gradle --- example/build.gradle | 3 +++ 1 file changed, 3 insertions(+) diff --git a/example/build.gradle b/example/build.gradle index daf7b254..c5ac2dc5 100644 --- a/example/build.gradle +++ b/example/build.gradle @@ -3,6 +3,9 @@ apply plugin: 'com.android.application' android { compileSdkVersion 27 buildToolsVersion "28" + aaptOptions { + cruncherEnabled = false + } defaultConfig { applicationId "net.ypresto.androidtranscoder.example" From c75e1e5849e2d11bbdcdf307112f50bd3c28e776 Mon Sep 17 00:00:00 2001 From: Amarendra Kumar Pandey Date: Wed, 12 Jun 2019 15:05:19 +0530 Subject: [PATCH 12/18] Update build.gradle --- example/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/example/build.gradle b/example/build.gradle index c5ac2dc5..272e94c2 100644 --- a/example/build.gradle +++ b/example/build.gradle @@ -1,7 +1,7 @@ apply plugin: 'com.android.application' android { - compileSdkVersion 27 + compileSdkVersion 19 buildToolsVersion "28" aaptOptions { cruncherEnabled = false @@ -9,7 +9,7 @@ android { defaultConfig { applicationId "net.ypresto.androidtranscoder.example" - minSdkVersion 27 + minSdkVersion 19 targetSdkVersion 28 versionCode 1 versionName "1.0" From edac0b41fbf5c753f8efd36edbb8c0340643b0db Mon Sep 17 00:00:00 2001 From: Amarendra Kumar Pandey Date: Wed, 12 Jun 2019 15:06:26 +0530 Subject: [PATCH 13/18] Update build.gradle --- lib/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/build.gradle b/lib/build.gradle index 2db2f66d..fa383639 100644 --- a/lib/build.gradle +++ b/lib/build.gradle @@ -15,7 +15,7 @@ android { buildToolsVersion "29.0.0" defaultConfig { - minSdkVersion 27 + minSdkVersion 19 targetSdkVersion 28 } From c1dbfe8b951baddb0cff2ca03c672947ca40dbd0 Mon Sep 17 00:00:00 2001 From: Amarendra Kumar Pandey Date: Wed, 12 Jun 2019 15:19:21 +0530 Subject: [PATCH 14/18] Update build.gradle --- example/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/example/build.gradle b/example/build.gradle index 272e94c2..90e4e4b4 100644 --- a/example/build.gradle +++ b/example/build.gradle @@ -1,7 +1,7 @@ apply plugin: 'com.android.application' android { - compileSdkVersion 19 + compileSdkVersion 23 buildToolsVersion "28" aaptOptions { cruncherEnabled = false @@ -9,7 +9,7 @@ android { defaultConfig { applicationId "net.ypresto.androidtranscoder.example" - minSdkVersion 19 + minSdkVersion 23 targetSdkVersion 28 versionCode 1 versionName "1.0" From dac5577ee4d34e36e63c541b103e59549a6c9fbc Mon Sep 17 00:00:00 2001 From: Amarendra Kumar Pandey Date: Wed, 12 Jun 2019 15:20:48 +0530 Subject: [PATCH 15/18] Update build.gradle --- example/build.gradle | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/example/build.gradle b/example/build.gradle index 90e4e4b4..4366cf25 100644 --- a/example/build.gradle +++ b/example/build.gradle @@ -1,16 +1,16 @@ apply plugin: 'com.android.application' android { - compileSdkVersion 23 - buildToolsVersion "28" + compileSdkVersion 25 + buildToolsVersion "29.0.0" aaptOptions { cruncherEnabled = false } defaultConfig { applicationId "net.ypresto.androidtranscoder.example" - minSdkVersion 23 - targetSdkVersion 28 + minSdkVersion 25 + targetSdkVersion 29 versionCode 1 versionName "1.0" } From ddd21285ff8ea01fba0272ae25ef5c09961419e8 Mon Sep 17 00:00:00 2001 From: Amarendra Kumar Pandey Date: Wed, 12 Jun 2019 15:21:40 +0530 Subject: [PATCH 16/18] Update build.gradle --- lib/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/build.gradle b/lib/build.gradle index fa383639..afa9d573 100644 --- a/lib/build.gradle +++ b/lib/build.gradle @@ -15,7 +15,7 @@ android { buildToolsVersion "29.0.0" defaultConfig { - minSdkVersion 19 + minSdkVersion 25 targetSdkVersion 28 } From 5c017b8c61eb4ff852e54457d392bba604e45061 Mon Sep 17 00:00:00 2001 From: Amarendra Kumar Pandey Date: Wed, 12 Jun 2019 15:27:47 +0530 Subject: [PATCH 17/18] Update build.gradle --- example/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/example/build.gradle b/example/build.gradle index 4366cf25..b50bd2ad 100644 --- a/example/build.gradle +++ b/example/build.gradle @@ -1,7 +1,7 @@ apply plugin: 'com.android.application' android { - compileSdkVersion 25 + compileSdkVersion 27 buildToolsVersion "29.0.0" aaptOptions { cruncherEnabled = false @@ -9,7 +9,7 @@ android { defaultConfig { applicationId "net.ypresto.androidtranscoder.example" - minSdkVersion 25 + minSdkVersion 19 targetSdkVersion 29 versionCode 1 versionName "1.0" From 701f4768087c5e65ce0fff267f402fd175a08db6 Mon Sep 17 00:00:00 2001 From: Amarendra Kumar Pandey Date: Wed, 12 Jun 2019 15:28:26 +0530 Subject: [PATCH 18/18] Update build.gradle --- lib/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/build.gradle b/lib/build.gradle index afa9d573..24b0527e 100644 --- a/lib/build.gradle +++ b/lib/build.gradle @@ -15,8 +15,8 @@ android { buildToolsVersion "29.0.0" defaultConfig { - minSdkVersion 25 - targetSdkVersion 28 + minSdkVersion 19 + targetSdkVersion 29 } buildTypes {