Revert of Refactor MediaCodecBridge to add support for NDK APIs

Revert of Refactor MediaCodecBridge to add support for NDK APIs (patchset #5 id:100001 of https://codereview.chromium.org/1472943002/ )

Reason for revert:
This breaks 64bit ARM

https://code.google.com/p/chromium/issues/detail?id=568923

Original issue's description:
> Refactor MediaCodecBridge to add support for NDK APIs
>
> Currently MediaCodecBridge is implemented with android MediaCodec SDK API.
> On android-21, MediaCodec NDK APIs have been added.
> This CL makes MediaCodecBridge a common ancestor inherited by the
> SDK and NDK implementation.
> Some common java functions are moved to MediaCodecUtil.java.
> The original native MediaCodecBridge class is renamed to
> SdkMediaCodecBridge.
> The NdkMediaCodecBridge is still WIP.
>
> BUG=560451
>
> Committed: https://crrev.com/5d52e0f8e63a294179df028a0dabc76a042cf9ec
> Cr-Commit-Position: refs/heads/master@{#363374}

TBR=timav@chromium.org,xhwang@chromium.org,sievers@chromium.org,qinmin@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=560451
Committed: https://crrev.com/04baa92bc02e36182c623632f831c1b3411e8434
Cr-Commit-Position: refs/heads/master@{#365131}

[acleung1, 2015-12-14 23:12:43]

Created Revert of Refactor MediaCodecBridge to add support for NDK APIs

[commit-bot: I haz the power, 2015-12-14 23:15:11]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1525003002/1
View timeline at
 https://chromium-cq-status.appspot.com/patch-timeline/1525003002/1

[commit-bot: I haz the power, 2015-12-14 23:18:42]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2015-12-14 23:18:43]

Failed to apply patch for media/BUILD.gn:
While running git apply --index -3 -p1;
  error: patch failed: media/BUILD.gn:395
  Falling back to three-way merge...
  Applied patch to 'media/BUILD.gn' with conflicts.
  U media/BUILD.gn

Patch:       media/BUILD.gn
Index: media/BUILD.gn
diff --git a/media/BUILD.gn b/media/BUILD.gn
index
d53cb6420de3ff14509f39db6122a9e429a5d87c..4d7e198a9200f2ab6f26cb186f8c635b44482f6e
100644
--- a/media/BUILD.gn
+++ b/media/BUILD.gn
@@ -395,16 +395,6 @@
       "//media/base/android:media_jni_headers",
       "//media/base/android:video_capture_jni_headers",
     ]
-
-    # Only 64 bit builds are using android-21 NDK library, check common.gypi
-    if (current_cpu == "arm64" || current_cpu == "x64" ||
-        current_cpu == "mips64el") {
-      sources += [
-        "base/android/ndk_media_codec_bridge.cc",
-        "base/android/ndk_media_codec_bridge.h",
-      ]
-      libs += [ "-lmediandk" ]
-    }
     allow_circular_includes_from = [ "//media/base/android" ]
   }

[commit-bot: I haz the power, 2015-12-14 23:22:06]

The CQ bit was unchecked by commit-bot@chromium.org

[acleung1, 2015-12-15 00:17:08]

The CQ bit was checked by acleung@chromium.org

[commit-bot: I haz the power, 2015-12-15 00:18:50]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1525003002/290001
View timeline at
 https://chromium-cq-status.appspot.com/patch-timeline/1525003002/290001

[commit-bot: I haz the power, 2015-12-15 00:24:05]

Description was changed from

==========
Revert of Refactor MediaCodecBridge to add support for NDK APIs (patchset #5
id:100001 of https://codereview.chromium.org/1472943002/ )

Reason for revert:
This breaks 64bit ARM

https://code.google.com/p/chromium/issues/detail?id=568923

Original issue's description:
> Refactor MediaCodecBridge to add support for NDK APIs
> 
> Currently MediaCodecBridge is implemented with android MediaCodec SDK API.
> On android-21, MediaCodec NDK APIs have been added.
> This CL makes MediaCodecBridge a common ancestor inherited by the
> SDK and NDK implementation.
> Some common java functions are moved to MediaCodecUtil.java.
> The original native MediaCodecBridge class is renamed to
> SdkMediaCodecBridge.
> The NdkMediaCodecBridge is still WIP.
> 
> BUG=560451
> 
> Committed: https://crrev.com/5d52e0f8e63a294179df028a0dabc76a042cf9ec
> Cr-Commit-Position: refs/heads/master@{#363374}

TBR=timav@chromium.org,xhwang@chromium.org,sievers@chromium.org,qinmin@chromi...
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=560451
==========

to

==========
Revert of Refactor MediaCodecBridge to add support for NDK APIs (patchset #5
id:100001 of https://codereview.chromium.org/1472943002/ )

Reason for revert:
This breaks 64bit ARM

https://code.google.com/p/chromium/issues/detail?id=568923

Original issue's description:
> Refactor MediaCodecBridge to add support for NDK APIs
> 
> Currently MediaCodecBridge is implemented with android MediaCodec SDK API.
> On android-21, MediaCodec NDK APIs have been added.
> This CL makes MediaCodecBridge a common ancestor inherited by the
> SDK and NDK implementation.
> Some common java functions are moved to MediaCodecUtil.java.
> The original native MediaCodecBridge class is renamed to
> SdkMediaCodecBridge.
> The NdkMediaCodecBridge is still WIP.
> 
> BUG=560451
> 
> Committed: https://crrev.com/5d52e0f8e63a294179df028a0dabc76a042cf9ec
> Cr-Commit-Position: refs/heads/master@{#363374}

TBR=timav@chromium.org,xhwang@chromium.org,sievers@chromium.org,qinmin@chromi...
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=560451
==========

[commit-bot: I haz the power, 2015-12-15 00:24:06]

Committed patchset #2 (id:290001)

[commit-bot: I haz the power, 2015-12-15 00:24:53]

Description was changed from

==========
Revert of Refactor MediaCodecBridge to add support for NDK APIs (patchset #5
id:100001 of https://codereview.chromium.org/1472943002/ )

Reason for revert:
This breaks 64bit ARM

https://code.google.com/p/chromium/issues/detail?id=568923

Original issue's description:
> Refactor MediaCodecBridge to add support for NDK APIs
> 
> Currently MediaCodecBridge is implemented with android MediaCodec SDK API.
> On android-21, MediaCodec NDK APIs have been added.
> This CL makes MediaCodecBridge a common ancestor inherited by the
> SDK and NDK implementation.
> Some common java functions are moved to MediaCodecUtil.java.
> The original native MediaCodecBridge class is renamed to
> SdkMediaCodecBridge.
> The NdkMediaCodecBridge is still WIP.
> 
> BUG=560451
> 
> Committed: https://crrev.com/5d52e0f8e63a294179df028a0dabc76a042cf9ec
> Cr-Commit-Position: refs/heads/master@{#363374}

TBR=timav@chromium.org,xhwang@chromium.org,sievers@chromium.org,qinmin@chromi...
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=560451
==========

to

==========
Revert of Refactor MediaCodecBridge to add support for NDK APIs (patchset #5
id:100001 of https://codereview.chromium.org/1472943002/ )

Reason for revert:
This breaks 64bit ARM

https://code.google.com/p/chromium/issues/detail?id=568923

Original issue's description:
> Refactor MediaCodecBridge to add support for NDK APIs
>
> Currently MediaCodecBridge is implemented with android MediaCodec SDK API.
> On android-21, MediaCodec NDK APIs have been added.
> This CL makes MediaCodecBridge a common ancestor inherited by the
> SDK and NDK implementation.
> Some common java functions are moved to MediaCodecUtil.java.
> The original native MediaCodecBridge class is renamed to
> SdkMediaCodecBridge.
> The NdkMediaCodecBridge is still WIP.
>
> BUG=560451
>
> Committed: https://crrev.com/5d52e0f8e63a294179df028a0dabc76a042cf9ec
> Cr-Commit-Position: refs/heads/master@{#363374}

TBR=timav@chromium.org,xhwang@chromium.org,sievers@chromium.org,qinmin@chromi...
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=560451

Committed: https://crrev.com/04baa92bc02e36182c623632f831c1b3411e8434
Cr-Commit-Position: refs/heads/master@{#365131}
==========

[commit-bot: I haz the power, 2015-12-15 00:24:54]

Patchset 2 (id:??) landed as
https://crrev.com/04baa92bc02e36182c623632f831c1b3411e8434
Cr-Commit-Position: refs/heads/master@{#365131}