From 0b8ee14be1b00430e269ae2be5a28c6eade5dfb8 Mon Sep 17 00:00:00 2001
From: Ricardo Cerqueira <ricardo@cyngn.com>
Date: Wed, 9 Mar 2016 11:42:39 +0000
Subject: [PATCH] Revert "crackling: Add highspeed media profiles"

This reverts commit bde04da6bc79915a58fa5e5c81833c0071a3309b.
It looks like you can only have profiles declared as "highspeed"
if the framerate is >= 100, regardless of resolution

----
    private static final int MIN_HIGH_SPEED_FPS = 100;
...
            case CamcorderProfile.QUALITY_HIGH_SPEED_720P:
                assertEquals(1280, profile.videoFrameWidth);
                assertEquals(720, profile.videoFrameHeight);
                assertTrue(profile.videoFrameRate >= MIN_HIGH_SPEED_FPS);
----

Fixes android.media.cts.CamcorderProfileTest#testGetWithId

Change-Id: I4ec23fcbda1993a7bbe4aba1b48aa8746d48c18d
---
 configs/media_profiles.xml | 41 --------------------------------------
 1 file changed, 41 deletions(-)

diff --git a/configs/media_profiles.xml b/configs/media_profiles.xml
index 46adab9..1600ef2 100644
--- a/configs/media_profiles.xml
+++ b/configs/media_profiles.xml
@@ -303,47 +303,6 @@
              channels="2" />
     </EncoderProfile>
 
-       <!-- CAMCORDER_QUALITY_HIGH_SPEED_LOW/720P : 720p@60fps; 55.0 Mbps -->
-        <EncoderProfile quality="highspeedlow" fileFormat="mp4" duration="30">
-            <Video codec="h264"
-                   bitRate="42000000"
-                   width="1280"
-                   height="720"
-                   frameRate="60" />
-            <!-- audio setting is ignored -->
-            <Audio codec="aac"
-                   bitRate="96000"
-                   sampleRate="48000"
-                   channels="1" />
-        </EncoderProfile>
-
-        <!-- CAMCORDER_QUALITY_HIGH_SPEED_HIGH/720P : 720p@60fps; 55.0 Mbps -->
-        <EncoderProfile quality="highspeedhigh" fileFormat="mp4" duration="30">
-            <Video codec="h264"
-                   bitRate="42000000"
-                   width="1280"
-                   height="720"
-                   frameRate="60" />
-            <!-- audio setting is ignored -->
-            <Audio codec="aac"
-                   bitRate="96000"
-                   sampleRate="48000"
-                   channels="1" />
-        </EncoderProfile>
-
-        <EncoderProfile quality="highspeed720p" fileFormat="mp4" duration="30">
-            <Video codec="h264"
-                   bitRate="42000000"
-                   width="1280"
-                   height="720"
-                   frameRate="60" />
-            <!-- audio setting is ignored -->
-            <Audio codec="aac"
-                   bitRate="96000"
-                   sampleRate="48000"
-                   channels="1" />
-        </EncoderProfile>
-
         <ImageEncoding quality="95" />
         <ImageEncoding quality="80" />
         <ImageEncoding quality="70" />