diff options
| author | qctecmdr <qctecmdr@localhost> | 2021-03-09 07:20:00 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2021-03-09 07:20:00 -0800 |
| commit | c56fa8cded3afd76c45a325863dc38da457b7bc1 (patch) | |
| tree | e91d7ecbbffb7f7135afe4376f877624cfc5f94a | |
| parent | e4e22cf468fcb508447558757974627ea2ef5f76 (diff) | |
| parent | d75ef4d81f0fdd889b30494d73959f325b12cb20 (diff) | |
| download | media-c56fa8cded3afd76c45a325863dc38da457b7bc1.tar.gz | |
Merge "conf_files: trinket: Remove 2k and qhd profiles"
| -rw-r--r-- | conf_files/trinket/media_profiles.xml | 56 |
1 files changed, 1 insertions, 55 deletions
diff --git a/conf_files/trinket/media_profiles.xml b/conf_files/trinket/media_profiles.xml index 1f10fd08..d9e7cdca 100644 --- a/conf_files/trinket/media_profiles.xml +++ b/conf_files/trinket/media_profiles.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <!-- Copyright (C) 2010 The Android Open Source Project - Copyright (C) 2012-2018 The Linux Foundation. All rights reserved. + Copyright (C) 2012-2018, 2021 The Linux Foundation. All rights reserved. Not a contribution. Licensed under the Apache License, Version 2.0 (the "License"); @@ -186,32 +186,6 @@ channels="2" /> </EncoderProfile> - <EncoderProfile quality="qhd" fileFormat="mp4" duration="30"> - <Video codec="h264" - bitRate="42000000" - width="2560" - height="1440" - frameRate="30" /> - - <Audio codec="aac" - bitRate="156000" - sampleRate="48000" - channels="2" /> - </EncoderProfile> - - <EncoderProfile quality="2k" fileFormat="mp4" duration="30"> - <Video codec="h264" - bitRate="20000000" - width="2048" - height="1080" - frameRate="30" /> - - <Audio codec="aac" - bitRate="156000" - sampleRate="48000" - channels="2" /> - </EncoderProfile> - <EncoderProfile quality="2160p" fileFormat="mp4" duration="30"> <Video codec="h264" bitRate="42000000" @@ -378,34 +352,6 @@ channels="2" /> </EncoderProfile> - <EncoderProfile quality="timelapseqhd" fileFormat="mp4" duration="30"> - <Video codec="h264" - bitRate="42000000" - width="2560" - height="1440" - frameRate="30" /> - - <!-- audio setting is ignored --> - <Audio codec="aac" - bitRate="156000" - sampleRate="48000" - channels="2" /> - </EncoderProfile> - - <EncoderProfile quality="timelapse2k" fileFormat="mp4" duration="30"> - <Video codec="h264" - bitRate="20000000" - width="2048" - height="1080" - frameRate="30" /> - - <!-- audio setting is ignored --> - <Audio codec="aac" - bitRate="156000" - sampleRate="48000" - channels="2" /> - </EncoderProfile> - <EncoderProfile quality="timelapse2160p" fileFormat="mp4" duration="30"> <Video codec="h264" bitRate="42000000" |