Add a YuvData type which contains the channel data and format informa…

…tion.

webrender/examples/yuv.rs

@@ -18,7 +18,7 @@ use webrender_traits::{ClipRegion, ColorF, Epoch};
 use webrender_traits::{DeviceIntPoint, DeviceUintSize, LayoutPoint, LayoutRect, LayoutSize};
 use webrender_traits::{ImageData, ImageDescriptor, ImageFormat};
 use webrender_traits::{PipelineId, TransformStyle};
-use webrender_traits::{YuvColorSpace, YuvFormat};
+use webrender_traits::{YuvColorSpace, YuvData};
 
 #[derive(Debug)]
 enum Gesture {
@@ -278,20 +278,14 @@ fn main() {
     builder.push_yuv_image(
         LayoutRect::new(LayoutPoint::new(100.0, 0.0), LayoutSize::new(100.0, 100.0)),
         ClipRegion::simple(&bounds),
-        yuv_chanel1,
-        Some(yuv_chanel2),
-        None,
-        YuvFormat::NV12,
+        YuvData::NV12(yuv_chanel1, yuv_chanel2),
         YuvColorSpace::Rec601,
     );
 
     builder.push_yuv_image(
         LayoutRect::new(LayoutPoint::new(300.0, 0.0), LayoutSize::new(100.0, 100.0)),
         ClipRegion::simple(&bounds),
-        yuv_chanel1,
-        Some(yuv_chanel2_1),
-        Some(yuv_chanel3),
-        YuvFormat::PlanarYCbCr,
+        YuvData::PlanarYCbCr(yuv_chanel1, yuv_chanel2_1, yuv_chanel3),
         YuvColorSpace::Rec601,
     );
 
@@ -348,4 +342,5 @@ fn main() {
         renderer.render(DeviceUintSize::new(width, height));
         window.swap_buffers().ok();
     }
-}
+}
+

webrender/src/frame.rs

@@ -594,10 +594,7 @@ impl Frame {
                     context.builder.add_yuv_image(clip_and_scroll,
                                                   item.rect,
                                                   &item.clip,
-                                                  info.plane_0_image_key,
-                                                  info.plane_1_image_key,
-                                                  info.plane_2_image_key,
-                                                  info.format,
+                                                  info.yuv_data,
                                                   info.color_space);
                 }
                 SpecificDisplayItem::Text(ref text_info) => {

webrender/src/frame_builder.rs

@@ -31,7 +31,7 @@ use webrender_traits::{ClipId, ClipRegion, ColorF, DeviceIntPoint, DeviceIntRect
 use webrender_traits::{DeviceUintRect, DeviceUintSize, ExtendMode, FontKey, FontRenderMode};
 use webrender_traits::{GlyphOptions, ImageKey, ImageRendering, ItemRange, LayerPoint, LayerRect};
 use webrender_traits::{LayerSize, LayerToScrollTransform, PipelineId, RepeatMode, TileOffset};
-use webrender_traits::{TransformStyle, WebGLContextId, YuvColorSpace, YuvFormat};
+use webrender_traits::{TransformStyle, WebGLContextId, YuvColorSpace, YuvData};
 
 #[derive(Debug, Clone)]
 struct ImageBorderSegment {
@@ -1014,18 +1014,17 @@ impl FrameBuilder {
                          clip_and_scroll: ClipAndScrollInfo,
                          rect: LayerRect,
                          clip_region: &ClipRegion,
-                         plane_0_image_key: ImageKey,
-                         plane_1_image_key: Option<ImageKey>,
-                         plane_2_image_key: Option<ImageKey>,
-                         format: YuvFormat,
+                         yuv_data: YuvData,
                          color_space: YuvColorSpace) {
+        let format = yuv_data.get_format();
+        let yuv_key = match yuv_data {
+            YuvData::NV12(plane_0, plane_1) => [plane_0, plane_1, ImageKey::new(0, 0)],
+            YuvData::PlanarYCbCr(plane_0, plane_1, plane_2) =>
+                [plane_0, plane_1, plane_2],
+        };
 
         let prim_cpu = YuvImagePrimitiveCpu {
-            yuv_key: [
-                plane_0_image_key,
-                plane_1_image_key.unwrap_or(ImageKey::new(0, 0)),
-                plane_2_image_key.unwrap_or(ImageKey::new(0, 0)),
-            ],
+            yuv_key: yuv_key,
             yuv_texture_id: [SourceTexture::Invalid, SourceTexture::Invalid, SourceTexture::Invalid],
             yuv_resource_address: GpuStoreAddress(0),
             format: format,

webrender_traits/src/display_item.rs

@@ -355,11 +355,7 @@ pub enum ImageRendering {
 
 #[derive(Clone, Copy, Debug, Deserialize, PartialEq, Serialize)]
 pub struct YuvImageDisplayItem {
-    // YUV image could have 1 to 3 planes.
-    pub plane_0_image_key: ImageKey,
-    pub plane_1_image_key: Option<ImageKey>,
-    pub plane_2_image_key: Option<ImageKey>,
-    pub format: YuvFormat,
+    pub yuv_data: YuvData,
     pub color_space: YuvColorSpace,
 }
 
@@ -379,6 +375,21 @@ impl YuvColorSpace {
     }
 }
 
+#[derive(Clone, Copy, Debug, Deserialize, Eq, Hash, PartialEq, Serialize)]
+pub enum YuvData {
+    NV12(ImageKey, ImageKey),
+    PlanarYCbCr(ImageKey, ImageKey, ImageKey),
+}
+
+impl YuvData {
+    pub fn get_format(&self) -> YuvFormat {
+        match *self {
+            YuvData::NV12(..) => YuvFormat::NV12,
+            YuvData::PlanarYCbCr(..) => YuvFormat::PlanarYCbCr,
+        }
+    }
+}
+
 #[derive(Clone, Copy, Debug, Deserialize, Eq, Hash, PartialEq, Serialize)]
 pub enum YuvFormat {
     NV12 = 0,

webrender_traits/src/display_list.rs

@@ -14,7 +14,7 @@ use {ImageRendering, ItemRange, LayoutPoint, LayoutRect, LayoutSize, LayoutTrans
 use {MixBlendMode, PipelineId, PropertyBinding, PushStackingContextDisplayItem, RadialGradient};
 use {RadialGradientDisplayItem, RectangleDisplayItem, ScrollPolicy, SpecificDisplayItem};
 use {StackingContext, TextDisplayItem, TransformStyle, WebGLContextId, WebGLDisplayItem};
-use {YuvColorSpace, YuvFormat, YuvImageDisplayItem};
+use {YuvColorSpace, YuvData, YuvImageDisplayItem};
 
 #[derive(Clone, Deserialize, Serialize)]
 pub struct AuxiliaryLists {
@@ -179,32 +179,14 @@ impl DisplayListBuilder {
         self.push_item(item, rect, clip);
     }
 
-    /// Push a yuv image. The number of input plane should match the format.
-    /// e.g.
-    ///   NV12 should have 2 planes.
-    ///
-    /// All planar data should use the same buffer type.
+    /// Push a yuv image. All planar data in yuv image should use the same buffer type.
     pub fn push_yuv_image(&mut self,
                           rect: LayoutRect,
                           clip: ClipRegion,
-                          plane_0_image_key: ImageKey,
-                          plane_1_image_key: Option<ImageKey>,
-                          plane_2_image_key: Option<ImageKey>,
-                          format: YuvFormat,
+                          yuv_data: YuvData,
                           color_space: YuvColorSpace) {
-        // Check the plane number for the YuvFormat.
-        match format.get_plane_num() {
-            1 => debug_assert!(plane_1_image_key.is_none() && plane_2_image_key.is_none()),
-            2 => debug_assert!(plane_1_image_key.is_some() && plane_2_image_key.is_none()),
-            3 => debug_assert!(plane_1_image_key.is_some() && plane_2_image_key.is_some()),
-            _ => debug_assert!(false),
-        }
-
         let item = SpecificDisplayItem::YuvImage(YuvImageDisplayItem {
-            plane_0_image_key: plane_0_image_key,
-            plane_1_image_key: plane_1_image_key,
-            plane_2_image_key: plane_2_image_key,
-            format: format,
+            yuv_data: yuv_data,
             color_space: color_space,
         });
         self.push_item(item, rect, clip);