Intermediate values are no more handled like field definitions.

FFmpeg · Apr 29, 2020 · a642b57 · a642b57
1 parent 2e99435
commit a642b57
Showing 1 changed file with 7 additions and 37 deletions.
diff --git a/ffv1.md b/ffv1.md
@@ -1312,29 +1312,13 @@ SliceContent( ) {                                             |
 }                                                             |
 ```
 
-### primary\_color\_count
+`primary_color_count` is `1 + (chroma_planes ? 2 : 0) + (extra_plane ? 1 : 0)`.
 
-`primary_color_count` is defined as `1 + ( chroma_planes ? 2 : 0 ) + ( `extra_plane` ? 1 : 0 )`.
+`plane_pixel_height[ p ]` is `(chroma_planes == 1 && (p == 1 || p == 2)) ? ceil(slice_pixel_height / (1 << log2_v_chroma_subsample)) : slice_pixel_height`
 
-### plane\_pixel\_height
+`slice_pixel_height` is `floor((slice_y + slice_height) * frame_pixel_height / num_v_slices) - slice_pixel_y`.
 
-`plane_pixel_height[ p ]` is the height in pixels of plane p of the slice.
-
-`plane_pixel_height[ 0 ]` and `plane_pixel_height[ 1 + ( chroma_planes ? 2 : 0 ) ]` value is `slice_pixel_height`.
-
-If `chroma_planes` is set to 1, `plane_pixel_height[ 1 ]` and `plane_pixel_height[ 2 ]` value is `ceil( slice_pixel_height / (1 << log2_v_chroma_subsample) )`.
-
-### slice\_pixel\_height
-
-`slice_pixel_height` is the height in pixels of the slice.
-
-Its value is `floor( ( slice_y + slice_height ) * slice_pixel_height / num_v_slices ) - slice_pixel_y`.
-
-### slice\_pixel\_y
-
-`slice_pixel_y` is the slice vertical position in pixels.
-
-Its value is `floor( slice_y * frame_pixel_height / num_v_slices )`.
+`slice_pixel_y` is `floor(slice_y * frame_pixel_height / num_v_slices)`.
 
 ## Line
 
@@ -1356,25 +1340,11 @@ Line( p, y ) {                                                |
 }                                                             |
 ```
 
-### plane\_pixel\_width
-
-`plane_pixel_width[ p ]` is the width in `Pixels` of `Plane` p of the slice.
-
-`plane_pixel_width[ 0 ]` and `plane_pixel_width[ 1 + ( chroma_planes ? 2 : 0 ) ]` value is `slice_pixel_width`.
-
-If `chroma_planes` is set to 1, `plane_pixel_width[ 1 ]` and `plane_pixel_width[ 2 ]` value is `ceil( slice_pixel_width / (1 << log2_h_chroma_subsample) )`.
-
-### slice\_pixel\_width
-
-`slice_pixel_width` is the width in `Pixels` of the slice.
-
-Its value is `floor( ( slice_x + slice_width ) * slice_pixel_width / num_h_slices ) - slice_pixel_x`.
-
-### slice\_pixel\_x
+`plane_pixel_width[ p ]` is `(chroma_planes == 1 && (p == 1 || p == 2)) ? ceil( slice_pixel_width / (1 << log2_h_chroma_subsample) ) : slice_pixel_width`.
 
-`slice_pixel_x` is the slice horizontal position in `Pixels`.
+`slice_pixel_width` is `floor( ( slice_x + slice_width ) * slice_pixel_width / num_h_slices ) - slice_pixel_x`.
 
-Its value is `floor( slice_x * frame_pixel_width / num_h_slices )`.
+`slice_pixel_x` is `floor( slice_x * frame_pixel_width / num_h_slices )`.
 
 ### sample\_difference