jp9000/obs-studio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

win-dshow: Use actual encoder names

Browse Source 
Was using a temporary name for the encoders still; now uses the actual
encoder names.
This commit is contained in:
jp9000 2014-12-21 10:41:30 -08:00
parent eb4a05667f
commit c456e42191
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/win-dshow/data/locale/en-US.ini
View File

@ -18,3 +18,5 @@ AudioDevice="Audio Device"
# encoder text # encoder text
Bitrate="Bitrate" Bitrate="Bitrate"
Encoder.C985="AverMedia C985 Hardware Encoder"
Encoder.C353="AverMedia C353 Hardware Encoder"

12
plugins/win-dshow/win-dshow-encoder.cpp
View File

@ -42,9 +42,14 @@ struct DShowEncoder {
struct encoder_packet *packet, bool *received_packet); struct encoder_packet *packet, bool *received_packet);
}; };
static const char *GetDShowEncoderName(void) static const char *GetC985EncoderName(void)
{ {
return "DShow Encoder (temp)"; return obs_module_text("Encoder.C985");
}
static const char *GetC353EncoderName(void)
{
return obs_module_text("Encoder.C353");
} }
static inline void FindDevice(DeviceId &id, const wchar_t *name) static inline void FindDevice(DeviceId &id, const wchar_t *name)
@ -331,7 +336,6 @@ void RegisterDShowEncoders()
obs_encoder_info info = {}; obs_encoder_info info = {};
info.type = OBS_ENCODER_VIDEO; info.type = OBS_ENCODER_VIDEO;
info.codec = "h264"; info.codec = "h264";
info.get_name = GetDShowEncoderName;
info.destroy = DestroyDShowEncoder; info.destroy = DestroyDShowEncoder;
info.encode = DShowEncode; info.encode = DShowEncode;
info.update = UpdateDShowEncoder; info.update = UpdateDShowEncoder;
@ -348,12 +352,14 @@ void RegisterDShowEncoders()
for (const DeviceId &device : devices) { for (const DeviceId &device : devices) {
if (!foundC985 && device.name.find(L"C985") != string::npos) { if (!foundC985 && device.name.find(L"C985") != string::npos) {
info.id = "dshow_c985_h264"; info.id = "dshow_c985_h264";
info.get_name = GetC985EncoderName;
info.create = CreateC985Encoder; info.create = CreateC985Encoder;
obs_register_encoder(&info); obs_register_encoder(&info);
foundC985 = true; foundC985 = true;
} else if (device.name.find(L"C353") != string::npos) { } else if (device.name.find(L"C353") != string::npos) {
info.id = "dshow_c353_h264"; info.id = "dshow_c353_h264";
info.get_name = GetC353EncoderName;
info.create = CreateC353Encoder; info.create = CreateC353Encoder;
obs_register_encoder(&info); obs_register_encoder(&info);
} }