Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 19 additions & 0 deletions SharpAvi/Codecs/IVideoEncoderExtraData.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;

namespace SharpAvi.Codecs
{
/// <summary>
/// Export extra data for some codecs
/// </summary>
public interface IVideoEncoderExtraData
{
/// <summary>
/// Encoded images header with extra data
/// </summary>
byte[] BitmapInfoHeader { get; }
}
}
17 changes: 16 additions & 1 deletion SharpAvi/Codecs/SingleThreadedVideoEncoderWrapper.cs
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ namespace SharpAvi.Codecs
/// like asynchronous encoding.
/// </para>
/// </remarks>
public class SingleThreadedVideoEncoderWrapper : IVideoEncoder, IDisposable
public class SingleThreadedVideoEncoderWrapper : IVideoEncoder, IVideoEncoderExtraData, IDisposable
{
private readonly IVideoEncoder encoder;
private readonly SingleThreadTaskScheduler scheduler;
Expand Down Expand Up @@ -65,6 +65,21 @@ public void Dispose()
/// </summary>
public int MaxEncodedSize => SchedulerInvoke(() => encoder.MaxEncodedSize);

/// <summary>
/// Encoded images header
/// </summary>
public byte[] BitmapInfoHeader => SchedulerInvoke(() =>
{
if (encoder is IVideoEncoderExtraData extraData)
{
return extraData.BitmapInfoHeader;
}
else
{
return null;
}
});

/// <summary>
/// Encodes a video frame.
/// </summary>
Expand Down
11 changes: 11 additions & 0 deletions SharpAvi/Output/AviVideoStream.cs
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ internal class AviVideoStream : AviStreamBase, IAviVideoStreamInternal
private int height;
private BitsPerPixel bitsPerPixel;
private int framesWritten;
private byte[] bitmapInfoHeader;

public AviVideoStream(int index, IAviStreamWriteHandler writeHandler,
int width, int height, BitsPerPixel bitsPerPixel)
Expand Down Expand Up @@ -71,6 +72,16 @@ public FourCC Codec
}
}

public byte[] BitmapInfoHeader
{
get { return bitmapInfoHeader; }
set
{
CheckNotFrozen();
bitmapInfoHeader = value;
}
}

public void WriteFrame(bool isKeyFrame, byte[] frameData, int startIndex, int count)
{
Argument.IsNotNull(frameData, nameof(frameData));
Expand Down
66 changes: 37 additions & 29 deletions SharpAvi/Output/AviWriter.cs
Original file line number Diff line number Diff line change
Expand Up @@ -537,39 +537,47 @@ void IAviStreamWriteHandler.WriteStreamHeader(AviAudioStream audioStream)

void IAviStreamWriteHandler.WriteStreamFormat(AviVideoStream videoStream)
{
// See BITMAPINFOHEADER structure
fileWriter.Write(40U); // size of structure
fileWriter.Write(videoStream.Width);
fileWriter.Write(videoStream.Height);
fileWriter.Write((short)1); // planes
fileWriter.Write((ushort)videoStream.BitsPerPixel); // bits per pixel
fileWriter.Write((uint)videoStream.Codec); // compression (codec FOURCC)
// 0 size is safer for uncompressed formats not to bother with stride calculation
var sizeInBytes = videoStream.Codec == CodecIds.Uncompressed
? 0
: videoStream.Width * videoStream.Height * (((int)videoStream.BitsPerPixel) / 8);
fileWriter.Write((uint)sizeInBytes); // image size in bytes
fileWriter.Write(0); // X pixels per meter
fileWriter.Write(0); // Y pixels per meter

// Writing grayscale palette for 8-bit uncompressed stream
// Otherwise, no palette
if (videoStream.BitsPerPixel == BitsPerPixel.Bpp8 && videoStream.Codec == CodecIds.Uncompressed)
var bitmapInfoHeader = videoStream.BitmapInfoHeader;
if (bitmapInfoHeader != null)
{
fileWriter.Write(256U); // palette colors used
fileWriter.Write(0U); // palette colors important
for (int i = 0; i < 256; i++)
{
fileWriter.Write((byte)i);
fileWriter.Write((byte)i);
fileWriter.Write((byte)i);
fileWriter.Write((byte)0);
}
fileWriter.Write(bitmapInfoHeader);
}
else
{
fileWriter.Write(0U); // palette colors used
fileWriter.Write(0U); // palette colors important
// See BITMAPINFOHEADER structure
fileWriter.Write(40U); // size of structure
fileWriter.Write(videoStream.Width);
fileWriter.Write(videoStream.Height);
fileWriter.Write((short)1); // planes
fileWriter.Write((ushort)videoStream.BitsPerPixel); // bits per pixel
fileWriter.Write((uint)videoStream.Codec); // compression (codec FOURCC)
// 0 size is safer for uncompressed formats not to bother with stride calculation
var sizeInBytes = videoStream.Codec == CodecIds.Uncompressed
? 0
: videoStream.Width * videoStream.Height * (((int)videoStream.BitsPerPixel) / 8);
fileWriter.Write((uint)sizeInBytes); // image size in bytes
fileWriter.Write(0); // X pixels per meter
fileWriter.Write(0); // Y pixels per meter

// Writing grayscale palette for 8-bit uncompressed stream
// Otherwise, no palette
if (videoStream.BitsPerPixel == BitsPerPixel.Bpp8 && videoStream.Codec == CodecIds.Uncompressed)
{
fileWriter.Write(256U); // palette colors used
fileWriter.Write(0U); // palette colors important
for (int i = 0; i < 256; i++)
{
fileWriter.Write((byte)i);
fileWriter.Write((byte)i);
fileWriter.Write((byte)i);
fileWriter.Write((byte)0);
}
}
else
{
fileWriter.Write(0U); // palette colors used
fileWriter.Write(0U); // palette colors important
}
}
}

Expand Down
20 changes: 20 additions & 0 deletions SharpAvi/Output/EncodingVideoStreamWrapper.cs
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,22 @@ public override BitsPerPixel BitsPerPixel
set => ThrowPropertyDefinedByEncoder();
}

public override byte[] BitmapInfoHeader
{
get
{
if (encoder is IVideoEncoderExtraData extraData)
{
return extraData.BitmapInfoHeader;
}
else
{
return BaseStream.BitmapInfoHeader;
}
}
set => ThrowPropertyDefinedByEncoder();
}

/// <summary>Encodes and writes a frame.</summary>
public override void WriteFrame(bool isKeyFrame, byte[] frameData, int startIndex, int length)
{
Expand Down Expand Up @@ -94,6 +110,10 @@ public override void PrepareForWriting()
// Set properties of the base stream
BaseStream.Codec = encoder.Codec;
BaseStream.BitsPerPixel = encoder.BitsPerPixel;
if (encoder is IVideoEncoderExtraData extraData)
{
BaseStream.BitmapInfoHeader = extraData.BitmapInfoHeader;
}

base.PrepareForWriting();
}
Expand Down
1 change: 1 addition & 0 deletions SharpAvi/Output/IAviVideoStreamInternal.cs
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,6 @@
{
internal interface IAviVideoStreamInternal : IAviVideoStream, IAviStreamInternal
{
byte[] BitmapInfoHeader { get; set; }
}
}
6 changes: 6 additions & 0 deletions SharpAvi/Output/VideoStreamWrapperBase.cs
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,12 @@ public virtual FourCC Codec
set { BaseStream.Codec = value; }
}

public virtual byte[] BitmapInfoHeader
{
get { return BaseStream.BitmapInfoHeader; }
set { BaseStream.BitmapInfoHeader = value; }
}

public virtual void WriteFrame(bool isKeyFrame, byte[] frameData, int startIndex, int length)
{
Argument.IsNotNull(frameData, nameof(frameData));
Expand Down