Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(429)

Side by Side Diff: media/gpu/vaapi_jpeg_decoder.cc

Issue 1882373004: Migrate content/common/gpu/media code to media/gpu (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix several more bot-identified build issues Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "content/common/gpu/media/vaapi_jpeg_decoder.h" 5 #include "media/gpu/vaapi_jpeg_decoder.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 #include <string.h> 8 #include <string.h>
9 9
10 #include "base/logging.h" 10 #include "base/logging.h"
11 #include "base/macros.h" 11 #include "base/macros.h"
12 #include "media/filters/jpeg_parser.h" 12 #include "media/filters/jpeg_parser.h"
13 13
14 namespace { 14 namespace {
15 15
16 // K.3.3.1 "Specification of typical tables for DC difference coding" 16 // K.3.3.1 "Specification of typical tables for DC difference coding"
17 media::JpegHuffmanTable 17 media::JpegHuffmanTable
18 kDefaultDcTable[media::kJpegMaxHuffmanTableNumBaseline] = { 18 kDefaultDcTable[media::kJpegMaxHuffmanTableNumBaseline] = {
19 // luminance DC coefficients 19 // luminance DC coefficients
20 { 20 {
21 true, 21 true,
22 {0, 1, 5, 1, 1, 1, 1, 1, 1, 0, 0, 0}, 22 {0, 1, 5, 1, 1, 1, 1, 1, 1, 0, 0, 0},
23 {0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0a, 0x0b}, 23 {0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0a,
24 }, 24 0x0b},
25 // chrominance DC coefficients 25 },
26 { 26 // chrominance DC coefficients
27 true, 27 {
28 {0, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0}, 28 true,
29 {0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0xa, 0xb}, 29 {0, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0},
30 }, 30 {0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0xa, 0xb},
31 },
31 }; 32 };
32 33
33 // K.3.3.2 "Specification of typical tables for AC coefficient coding" 34 // K.3.3.2 "Specification of typical tables for AC coefficient coding"
34 media::JpegHuffmanTable 35 media::JpegHuffmanTable
35 kDefaultAcTable[media::kJpegMaxHuffmanTableNumBaseline] = { 36 kDefaultAcTable[media::kJpegMaxHuffmanTableNumBaseline] = {
36 // luminance AC coefficients 37 // luminance AC coefficients
37 { 38 {
38 true, 39 true,
39 {0, 2, 1, 3, 3, 2, 4, 3, 5, 5, 4, 4, 0, 0, 1, 0x7d}, 40 {0, 2, 1, 3, 3, 2, 4, 3, 5, 5, 4, 4, 0, 0, 1, 0x7d},
40 {0x01, 0x02, 0x03, 0x00, 0x04, 0x11, 0x05, 0x12, 41 {0x01, 0x02, 0x03, 0x00, 0x04, 0x11, 0x05, 0x12, 0x21, 0x31, 0x41,
41 0x21, 0x31, 0x41, 0x06, 0x13, 0x51, 0x61, 0x07, 42 0x06, 0x13, 0x51, 0x61, 0x07, 0x22, 0x71, 0x14, 0x32, 0x81, 0x91,
42 0x22, 0x71, 0x14, 0x32, 0x81, 0x91, 0xa1, 0x08, 43 0xa1, 0x08, 0x23, 0x42, 0xb1, 0xc1, 0x15, 0x52, 0xd1, 0xf0, 0x24,
43 0x23, 0x42, 0xb1, 0xc1, 0x15, 0x52, 0xd1, 0xf0, 44 0x33, 0x62, 0x72, 0x82, 0x09, 0x0a, 0x16, 0x17, 0x18, 0x19, 0x1a,
44 0x24, 0x33, 0x62, 0x72, 0x82, 0x09, 0x0a, 0x16, 45 0x25, 0x26, 0x27, 0x28, 0x29, 0x2a, 0x34, 0x35, 0x36, 0x37, 0x38,
45 0x17, 0x18, 0x19, 0x1a, 0x25, 0x26, 0x27, 0x28, 46 0x39, 0x3a, 0x43, 0x44, 0x45, 0x46, 0x47, 0x48, 0x49, 0x4a, 0x53,
46 0x29, 0x2a, 0x34, 0x35, 0x36, 0x37, 0x38, 0x39, 47 0x54, 0x55, 0x56, 0x57, 0x58, 0x59, 0x5a, 0x63, 0x64, 0x65, 0x66,
47 0x3a, 0x43, 0x44, 0x45, 0x46, 0x47, 0x48, 0x49, 48 0x67, 0x68, 0x69, 0x6a, 0x73, 0x74, 0x75, 0x76, 0x77, 0x78, 0x79,
48 0x4a, 0x53, 0x54, 0x55, 0x56, 0x57, 0x58, 0x59, 49 0x7a, 0x83, 0x84, 0x85, 0x86, 0x87, 0x88, 0x89, 0x8a, 0x92, 0x93,
49 0x5a, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68, 0x69, 50 0x94, 0x95, 0x96, 0x97, 0x98, 0x99, 0x9a, 0xa2, 0xa3, 0xa4, 0xa5,
50 0x6a, 0x73, 0x74, 0x75, 0x76, 0x77, 0x78, 0x79, 51 0xa6, 0xa7, 0xa8, 0xa9, 0xaa, 0xb2, 0xb3, 0xb4, 0xb5, 0xb6, 0xb7,
51 0x7a, 0x83, 0x84, 0x85, 0x86, 0x87, 0x88, 0x89, 52 0xb8, 0xb9, 0xba, 0xc2, 0xc3, 0xc4, 0xc5, 0xc6, 0xc7, 0xc8, 0xc9,
52 0x8a, 0x92, 0x93, 0x94, 0x95, 0x96, 0x97, 0x98, 53 0xca, 0xd2, 0xd3, 0xd4, 0xd5, 0xd6, 0xd7, 0xd8, 0xd9, 0xda, 0xe1,
53 0x99, 0x9a, 0xa2, 0xa3, 0xa4, 0xa5, 0xa6, 0xa7, 54 0xe2, 0xe3, 0xe4, 0xe5, 0xe6, 0xe7, 0xe8, 0xe9, 0xea, 0xf1, 0xf2,
54 0xa8, 0xa9, 0xaa, 0xb2, 0xb3, 0xb4, 0xb5, 0xb6, 55 0xf3, 0xf4, 0xf5, 0xf6, 0xf7, 0xf8, 0xf9, 0xfa},
55 0xb7, 0xb8, 0xb9, 0xba, 0xc2, 0xc3, 0xc4, 0xc5, 56 },
56 0xc6, 0xc7, 0xc8, 0xc9, 0xca, 0xd2, 0xd3, 0xd4, 57 // chrominance AC coefficients
57 0xd5, 0xd6, 0xd7, 0xd8, 0xd9, 0xda, 0xe1, 0xe2, 58 {
58 0xe3, 0xe4, 0xe5, 0xe6, 0xe7, 0xe8, 0xe9, 0xea, 59 true,
59 0xf1, 0xf2, 0xf3, 0xf4, 0xf5, 0xf6, 0xf7, 0xf8, 60 {0, 2, 1, 2, 4, 4, 3, 4, 7, 5, 4, 4, 0, 1, 2, 0x77},
60 0xf9, 0xfa}, 61 {0x00, 0x01, 0x02, 0x03, 0x11, 0x04, 0x05, 0x21, 0x31, 0x06, 0x12,
61 }, 62 0x41, 0x51, 0x07, 0x61, 0x71, 0x13, 0x22, 0x32, 0x81, 0x08, 0x14,
62 // chrominance AC coefficients 63 0x42, 0x91, 0xa1, 0xb1, 0xc1, 0x09, 0x23, 0x33, 0x52, 0xf0, 0x15,
63 { 64 0x62, 0x72, 0xd1, 0x0a, 0x16, 0x24, 0x34, 0xe1, 0x25, 0xf1, 0x17,
64 true, 65 0x18, 0x19, 0x1a, 0x26, 0x27, 0x28, 0x29, 0x2a, 0x35, 0x36, 0x37,
65 {0, 2, 1, 2, 4, 4, 3, 4, 7, 5, 4, 4, 0, 1, 2, 0x77}, 66 0x38, 0x39, 0x3a, 0x43, 0x44, 0x45, 0x46, 0x47, 0x48, 0x49, 0x4a,
66 {0x00, 0x01, 0x02, 0x03, 0x11, 0x04, 0x05, 0x21, 67 0x53, 0x54, 0x55, 0x56, 0x57, 0x58, 0x59, 0x5a, 0x63, 0x64, 0x65,
67 0x31, 0x06, 0x12, 0x41, 0x51, 0x07, 0x61, 0x71, 68 0x66, 0x67, 0x68, 0x69, 0x6a, 0x73, 0x74, 0x75, 0x76, 0x77, 0x78,
68 0x13, 0x22, 0x32, 0x81, 0x08, 0x14, 0x42, 0x91, 69 0x79, 0x7a, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87, 0x88, 0x89, 0x8a,
69 0xa1, 0xb1, 0xc1, 0x09, 0x23, 0x33, 0x52, 0xf0, 70 0x92, 0x93, 0x94, 0x95, 0x96, 0x97, 0x98, 0x99, 0x9a, 0xa2, 0xa3,
70 0x15, 0x62, 0x72, 0xd1, 0x0a, 0x16, 0x24, 0x34, 71 0xa4, 0xa5, 0xa6, 0xa7, 0xa8, 0xa9, 0xaa, 0xb2, 0xb3, 0xb4, 0xb5,
71 0xe1, 0x25, 0xf1, 0x17, 0x18, 0x19, 0x1a, 0x26, 72 0xb6, 0xb7, 0xb8, 0xb9, 0xba, 0xc2, 0xc3, 0xc4, 0xc5, 0xc6, 0xc7,
72 0x27, 0x28, 0x29, 0x2a, 0x35, 0x36, 0x37, 0x38, 73 0xc8, 0xc9, 0xca, 0xd2, 0xd3, 0xd4, 0xd5, 0xd6, 0xd7, 0xd8, 0xd9,
73 0x39, 0x3a, 0x43, 0x44, 0x45, 0x46, 0x47, 0x48, 74 0xda, 0xe2, 0xe3, 0xe4, 0xe5, 0xe6, 0xe7, 0xe8, 0xe9, 0xea, 0xf2,
74 0x49, 0x4a, 0x53, 0x54, 0x55, 0x56, 0x57, 0x58, 75 0xf3, 0xf4, 0xf5, 0xf6, 0xf7, 0xf8, 0xf9, 0xfa},
75 0x59, 0x5a, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68, 76 },
76 0x69, 0x6a, 0x73, 0x74, 0x75, 0x76, 0x77, 0x78,
77 0x79, 0x7a, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87,
78 0x88, 0x89, 0x8a, 0x92, 0x93, 0x94, 0x95, 0x96,
79 0x97, 0x98, 0x99, 0x9a, 0xa2, 0xa3, 0xa4, 0xa5,
80 0xa6, 0xa7, 0xa8, 0xa9, 0xaa, 0xb2, 0xb3, 0xb4,
81 0xb5, 0xb6, 0xb7, 0xb8, 0xb9, 0xba, 0xc2, 0xc3,
82 0xc4, 0xc5, 0xc6, 0xc7, 0xc8, 0xc9, 0xca, 0xd2,
83 0xd3, 0xd4, 0xd5, 0xd6, 0xd7, 0xd8, 0xd9, 0xda,
84 0xe2, 0xe3, 0xe4, 0xe5, 0xe6, 0xe7, 0xe8, 0xe9,
85 0xea, 0xf2, 0xf3, 0xf4, 0xf5, 0xf6, 0xf7, 0xf8,
86 0xf9, 0xfa},
87 },
88 }; 77 };
89 78
90 } // namespace 79 } // namespace
91 80
92 namespace content { 81 namespace media {
93 82
94 // VAAPI only support subset of JPEG profiles. This function determines a given 83 // VAAPI only support subset of JPEG profiles. This function determines a given
95 // parsed JPEG result is supported or not. 84 // parsed JPEG result is supported or not.
96 static bool IsVaapiSupportedJpeg(const media::JpegParseResult& jpeg) { 85 static bool IsVaapiSupportedJpeg(const media::JpegParseResult& jpeg) {
97 if (jpeg.frame_header.visible_width < 1 || 86 if (jpeg.frame_header.visible_width < 1 ||
98 jpeg.frame_header.visible_height < 1) { 87 jpeg.frame_header.visible_height < 1) {
99 DLOG(ERROR) << "width(" << jpeg.frame_header.visible_width 88 DLOG(ERROR) << "width(" << jpeg.frame_header.visible_width
100 << ") and height(" << jpeg.frame_header.visible_height 89 << ") and height(" << jpeg.frame_header.visible_height
101 << ") should be at least 1"; 90 << ") should be at least 1";
102 return false; 91 return false;
(...skipping 194 matching lines...) Expand 10 before | Expand all | Expand 10 after
297 parse_result.data_size, 286 parse_result.data_size,
298 const_cast<char*>(parse_result.data))) 287 const_cast<char*>(parse_result.data)))
299 return false; 288 return false;
300 289
301 if (!vaapi_wrapper->ExecuteAndDestroyPendingBuffers(va_surface)) 290 if (!vaapi_wrapper->ExecuteAndDestroyPendingBuffers(va_surface))
302 return false; 291 return false;
303 292
304 return true; 293 return true;
305 } 294 }
306 295
307 } // namespace content 296 } // namespace media
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698