| Révision | eb557f685a4ec92362f17b0be00fb9d13a331f99 (tree) |
|---|---|
| l'heure | 2020-11-20 01:03:56 |
| Auteur | Chih-Wei Huang <cwhuang@linu...> |
| Commiter | Chih-Wei Huang |
Merge remote-tracking branch 'x86/nougat-x86' into oreo-x86
data/media_codecs_ffmpeg.xml (diff)
omx/SoftFFmpegVideo.cpp (diff)| @@ -96,12 +96,12 @@ | ||
| 96 | 96 | <Feature name="adaptive-playback" /> |
| 97 | 97 | </MediaCodec> |
| 98 | 98 | <MediaCodec name="OMX.ffmpeg.h264.decoder" type="video/avc"> |
| 99 | - <Limit name="size" min="2x2" max="2048x2048" /> | |
| 99 | + <Limit name="size" min="2x2" max="4080x4080" /> | |
| 100 | 100 | <Limit name="alignment" value="2x2" /> |
| 101 | 101 | <Feature name="adaptive-playback" /> |
| 102 | 102 | </MediaCodec> |
| 103 | 103 | <MediaCodec name="OMX.ffmpeg.hevc.decoder" type="video/hevc"> |
| 104 | - <Limit name="size" min="2x2" max="2048x2048" /> | |
| 104 | + <Limit name="size" min="2x2" max="4096x4096" /> | |
| 105 | 105 | <Limit name="alignment" value="2x2" /> |
| 106 | 106 | <Feature name="adaptive-playback" /> |
| 107 | 107 | </MediaCodec> |
| @@ -42,58 +42,9 @@ static const CodecProfileLevel kM4VProfileLevels[] = { | ||
| 42 | 42 | }; |
| 43 | 43 | |
| 44 | 44 | static const CodecProfileLevel kAVCProfileLevels[] = { |
| 45 | - { OMX_VIDEO_AVCProfileBaseline, OMX_VIDEO_AVCLevel1 }, | |
| 46 | - { OMX_VIDEO_AVCProfileBaseline, OMX_VIDEO_AVCLevel1b }, | |
| 47 | - { OMX_VIDEO_AVCProfileBaseline, OMX_VIDEO_AVCLevel11 }, | |
| 48 | - { OMX_VIDEO_AVCProfileBaseline, OMX_VIDEO_AVCLevel12 }, | |
| 49 | - { OMX_VIDEO_AVCProfileBaseline, OMX_VIDEO_AVCLevel13 }, | |
| 50 | - { OMX_VIDEO_AVCProfileBaseline, OMX_VIDEO_AVCLevel2 }, | |
| 51 | - { OMX_VIDEO_AVCProfileBaseline, OMX_VIDEO_AVCLevel21 }, | |
| 52 | - { OMX_VIDEO_AVCProfileBaseline, OMX_VIDEO_AVCLevel22 }, | |
| 53 | - { OMX_VIDEO_AVCProfileBaseline, OMX_VIDEO_AVCLevel3 }, | |
| 54 | - { OMX_VIDEO_AVCProfileBaseline, OMX_VIDEO_AVCLevel31 }, | |
| 55 | - { OMX_VIDEO_AVCProfileBaseline, OMX_VIDEO_AVCLevel32 }, | |
| 56 | - { OMX_VIDEO_AVCProfileBaseline, OMX_VIDEO_AVCLevel4 }, | |
| 57 | - { OMX_VIDEO_AVCProfileBaseline, OMX_VIDEO_AVCLevel41 }, | |
| 58 | - { OMX_VIDEO_AVCProfileBaseline, OMX_VIDEO_AVCLevel42 }, | |
| 59 | - { OMX_VIDEO_AVCProfileBaseline, OMX_VIDEO_AVCLevel5 }, | |
| 60 | - { OMX_VIDEO_AVCProfileBaseline, OMX_VIDEO_AVCLevel51 }, | |
| 45 | + // Only declare the highest level for each supported profile | |
| 61 | 46 | { OMX_VIDEO_AVCProfileBaseline, OMX_VIDEO_AVCLevel52 }, |
| 62 | - | |
| 63 | - { OMX_VIDEO_AVCProfileMain, OMX_VIDEO_AVCLevel1 }, | |
| 64 | - { OMX_VIDEO_AVCProfileMain, OMX_VIDEO_AVCLevel1b }, | |
| 65 | - { OMX_VIDEO_AVCProfileMain, OMX_VIDEO_AVCLevel11 }, | |
| 66 | - { OMX_VIDEO_AVCProfileMain, OMX_VIDEO_AVCLevel12 }, | |
| 67 | - { OMX_VIDEO_AVCProfileMain, OMX_VIDEO_AVCLevel13 }, | |
| 68 | - { OMX_VIDEO_AVCProfileMain, OMX_VIDEO_AVCLevel2 }, | |
| 69 | - { OMX_VIDEO_AVCProfileMain, OMX_VIDEO_AVCLevel21 }, | |
| 70 | - { OMX_VIDEO_AVCProfileMain, OMX_VIDEO_AVCLevel22 }, | |
| 71 | - { OMX_VIDEO_AVCProfileMain, OMX_VIDEO_AVCLevel3 }, | |
| 72 | - { OMX_VIDEO_AVCProfileMain, OMX_VIDEO_AVCLevel31 }, | |
| 73 | - { OMX_VIDEO_AVCProfileMain, OMX_VIDEO_AVCLevel32 }, | |
| 74 | - { OMX_VIDEO_AVCProfileMain, OMX_VIDEO_AVCLevel4 }, | |
| 75 | - { OMX_VIDEO_AVCProfileMain, OMX_VIDEO_AVCLevel41 }, | |
| 76 | - { OMX_VIDEO_AVCProfileMain, OMX_VIDEO_AVCLevel42 }, | |
| 77 | - { OMX_VIDEO_AVCProfileMain, OMX_VIDEO_AVCLevel5 }, | |
| 78 | - { OMX_VIDEO_AVCProfileMain, OMX_VIDEO_AVCLevel51 }, | |
| 79 | 47 | { OMX_VIDEO_AVCProfileMain, OMX_VIDEO_AVCLevel52 }, |
| 80 | - | |
| 81 | - { OMX_VIDEO_AVCProfileHigh, OMX_VIDEO_AVCLevel1 }, | |
| 82 | - { OMX_VIDEO_AVCProfileHigh, OMX_VIDEO_AVCLevel1b }, | |
| 83 | - { OMX_VIDEO_AVCProfileHigh, OMX_VIDEO_AVCLevel11 }, | |
| 84 | - { OMX_VIDEO_AVCProfileHigh, OMX_VIDEO_AVCLevel12 }, | |
| 85 | - { OMX_VIDEO_AVCProfileHigh, OMX_VIDEO_AVCLevel13 }, | |
| 86 | - { OMX_VIDEO_AVCProfileHigh, OMX_VIDEO_AVCLevel2 }, | |
| 87 | - { OMX_VIDEO_AVCProfileHigh, OMX_VIDEO_AVCLevel21 }, | |
| 88 | - { OMX_VIDEO_AVCProfileHigh, OMX_VIDEO_AVCLevel22 }, | |
| 89 | - { OMX_VIDEO_AVCProfileHigh, OMX_VIDEO_AVCLevel3 }, | |
| 90 | - { OMX_VIDEO_AVCProfileHigh, OMX_VIDEO_AVCLevel31 }, | |
| 91 | - { OMX_VIDEO_AVCProfileHigh, OMX_VIDEO_AVCLevel32 }, | |
| 92 | - { OMX_VIDEO_AVCProfileHigh, OMX_VIDEO_AVCLevel4 }, | |
| 93 | - { OMX_VIDEO_AVCProfileHigh, OMX_VIDEO_AVCLevel41 }, | |
| 94 | - { OMX_VIDEO_AVCProfileHigh, OMX_VIDEO_AVCLevel42 }, | |
| 95 | - { OMX_VIDEO_AVCProfileHigh, OMX_VIDEO_AVCLevel5 }, | |
| 96 | - { OMX_VIDEO_AVCProfileHigh, OMX_VIDEO_AVCLevel51 }, | |
| 97 | 48 | { OMX_VIDEO_AVCProfileHigh, OMX_VIDEO_AVCLevel52 }, |
| 98 | 49 | }; |
| 99 | 50 |
Android-x86
Fork