Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Remove slice_count reference
slice_count is used but not defined.
It is actually not in the bistream, so we remove it from the spec.

"i" in Slice ( i ) is also removed in order to have coherency
in the spec.
  • Loading branch information
JeromeMartinez authored and michaelni committed Jun 1, 2016
1 parent c1cf473 commit c5e8bc1
Showing 1 changed file with 9 additions and 9 deletions.
18 changes: 9 additions & 9 deletions ffv1.md
Expand Up @@ -518,23 +518,25 @@ See [NUT](#references) for more information about elements.

## Frame

A frame consists of the keyframe field, parameters (if version <=1), and a sequence of independent slices.

| |
|---------------------------------------------------|---:|
|Frame( ) { |type|
|    keyframe | br|
|    if( keyframe && !ConfigurationRecordIsPresent )| |
|         Parameters( ) | |
|    for( i = 0; i \< slice\_count; i++ ) | |
|        Slice( i ) | |
|    while ( remaining\_bits\_in\_bitstream() ) | |
|        Slice( ) | |
|} | |

## Slice

| |
|------------------------------------------------------------|:------|
|Slice( i ) { | type |
|Slice( ) { | type |
|    if( version \>= 3 ) | |
|        SliceHeader( i ) | |
|        SliceHeader( ) | |
|    SliceContent( ) | |
|    if ( coder\_type == 0 ) | |
| while ( !byte\_aligned() ) | |
Expand All @@ -550,13 +552,13 @@ MUST be 0.

| | |
|------------------------------------------------------------|---:|
| SliceHeader( i ) { |type|
| SliceHeader( ) { |type|
|    slice\_x | ur |
|    slice\_y | ur |
|    slice\_width - 1 | ur |
|    slice\_height - 1 | ur |
|    for( j = 0; j \< quant\_table\_index\_count; j++ ) | |
|        quant\_table\_index [ i ][ j ] | ur |
|    for( i = 0; i \< quant\_table\_index\_count; i++ ) | |
|        quant\_table\_index [ i ] | ur |
|    picture\_structure | ur |
|    sar\_num | ur |
|    sar\_den | ur |
Expand Down Expand Up @@ -808,8 +810,6 @@ Inferred to be 0 if not present.
pred = j ? initial\_states[ i ][j - 1][ k ] : 128
initial\_state[ i ][ j ][ k ] = ( pred + initial\_state\_delta[ i ][ j ][ k ] ) & 255

**slice\_count** indicates the number of slices in the current frame, slice\_count is 1 if it is not explicitly coded.

**ec** indicates the error detection/correction type.

|value | error detection/correction type |
Expand Down

0 comments on commit c5e8bc1

Please sign in to comment.